437 files changed, 50406 insertions, 48171 deletions

diff --git a/ABOUT-NLS b/ABOUT-NLS
index dd2659f0a..ec20977e0 100644
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
@@ -1,5 +1,5 @@
-Notes on the Free Translation Project
-*************************************
+1 Notes on the Free Translation Project
+***************************************
 
 Free software is going international!  The Free Translation Project is
 a way to get maintainers of free software, translators, and users all
@@ -23,8 +23,8 @@ related to internationalization, you should tell about the version of
 `gettext' which is used.  The information can be found in the
 `intl/VERSION' file, in internationalized packages.
 
-Quick configuration advice
-==========================
+1.1 Quick configuration advice
+==============================
 
 If you want to exploit the full power of internationalization, you
 should configure it using
@@ -46,8 +46,8 @@ to change to GNU `gettext' as soon as possible.
 you have installed a recent copy of the GNU gettext package with the
 included `libintl'.
 
-INSTALL Matters
-===============
+1.2 INSTALL Matters
+===================
 
 Some packages are "localizable" when properly installed; the programs
 they contain can be made to speak your own native language.  Most such
@@ -96,8 +96,8 @@ may be set, prior to configuration, to limit the installed set.
 `LINGUAS' should then contain a space separated list of two-letter
 codes, stating which languages are allowed.
 
-Using This Package
-==================
+1.3 Using This Package
+======================
 
 As a user, if your language has been installed for this package, you
 only have to set the `LANG' environment variable to the appropriate
@@ -118,8 +118,8 @@ country code serves to distinguish the dialects.
 language and `CC' denoting the country, is the one use on systems based
 on GNU libc.  On other systems, some variations of this scheme are
 used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
-locales supported by your system for your country by running the command
-`locale -a | grep '^LL''.
+locales supported by your system for your language by running the
+command `locale -a | grep '^LL''.
 
    Not all programs have translations for all languages.  By default, an
 English message is shown in place of a nonexistent translation.  If you
@@ -145,8 +145,8 @@ to denote the language's main dialect.  For example, `de' is equivalent
 to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
 (Portuguese as spoken in Portugal) in this context.
 
-Translating Teams
-=================
+1.4 Translating Teams
+=====================
 
 For the Free Translation Project to be a success, we need interested
 people who like their own language and write it well, and who are also
@@ -172,565 +172,897 @@ get started, please write to `[email protected]' to reach the
 coordinator for all translator teams.
 
    The English team is special.  It works at improving and uniformizing
-the terminology in use.  Proven linguistic skill are praised more than
-programming skill, here.
+the terminology in use.  Proven linguistic skills are praised more than
+programming skills, here.
 
-Available Packages
-==================
+1.5 Available Packages
+======================
 
 Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of January
-2004.  The matrix shows, in regard of each package, for which languages
+matrix shows the current state of internationalization, as of October
+2006.  The matrix shows, in regard of each package, for which languages
 PO files have been submitted to translation coordination, with a
 translation percentage of at least 50%.
 
-     Ready PO files       af am ar az be bg bs ca cs da de el en en_GB eo es
+     Ready PO files       af am ar az be bg bs ca cs cy da de el en en_GB eo
                         +----------------------------------------------------+
-     a2ps               |             []             [] [] []                |
-     aegis              |                               ()                   |
-     ant-phone          |                               ()                   |
-     anubis             |                                                    |
+     GNUnet             |                                  []                |
+     a2ps               |             []                [] [] []     []      |
+     aegis              |                                  ()                |
+     ant-phone          |                                  ()                |
+     anubis             |                                  []                |
      ap-utils           |                                                    |
-     aspell             |             []                                     |
-     bash               |                      []       []             [] [] |
-     batchelor          |                                                    |
-     bfd                |                            []                   [] |
-     binutils           |                            []                   [] |
-     bison              |                            [] []                [] |
-     bluez-pin          | []                      []                   []    |
-     clisp              |                                                    |
-     clisp              |                               []    []          [] |
-     console-tools      |                         []    []                   |
-     coreutils          |                      []    [] []                [] |
-     cpio               |                            [] []                [] |
-     darkstat           |                []          ()                   [] |
-     diffutils          |                      [] [] [] [] []          [] [] |
-     e2fsprogs          |                         []    []                [] |
-     enscript           |                      []    [] []        []         |
-     error              |                      []    [] []        []      [] |
-     fetchmail          |                      [] () [] [] []             [] |
-     fileutils          |                            [] []                [] |
-     findutils          |             []       []    [] [] []          [] [] |
-     flex               |                      []    [] []                [] |
-     fslint             |                                                    |
-     gas                |                                                 [] |
-     gawk               |                      []    [] []                [] |
-     gbiff              |                               []                   |
+     aspell             |                      [] []    [] []        []      |
+     bash               |                      []          []             [] |
+     batchelor          |                                  []                |
+     bfd                |                                                    |
+     bibshelf           |                                  []                |
+     binutils           |                               []                   |
+     bison              |                               [] []                |
+     bison-runtime      |                                                    |
+     bluez-pin          | []                      []       [] []          [] |
+     cflow              |                               []                   |
+     clisp              |                                  []    []          |
+     console-tools      |                         []       []                |
+     coreutils          |                []    []          []                |
+     cpio               |                                                    |
+     cpplib             |                      []       [] []                |
+     cryptonit          |                                  []                |
+     darkstat           |                []             () []                |
+     dialog             |                      [] [] [] [] [] []             |
+     diffutils          |                      [] []    [] [] []          [] |
+     doodle             |                                  []                |
+     e2fsprogs          |                         []       []                |
+     enscript           |                      []       [] []        []      |
+     error              |                      []       [] []        []      |
+     fetchmail          |                      []       [] () []             |
+     fileutils          |                               [] []                |
+     findutils          |                []    []       []                   |
+     flex               |                      []       [] []                |
+     fslint             |                                  []                |
+     gas                |                                                    |
+     gawk               |                      []       [] []                |
+     gbiff              |                                  []                |
      gcal               |                      []                            |
-     gcc                |                            []                   [] |
-     gettext            |             []       []    [] []                [] |
-     gettext-examples   | []                   []       []                [] |
-     gettext-runtime    |             []       []    [] []                [] |
-     gettext-tools      |                      []       []                [] |
-     gimp-print         |                         [] [] []        []      [] |
-     gliv               |                                                    |
-     glunarclock        |                            [] []                   |
-     gnubiff            |                               []                   |
-     gnucash            |                         []    ()        []      [] |
-     gnucash-glossary   |                            [] ()                [] |
-     gnupg              |                      [] ()    [] []          [] [] |
-     gpe-aerial         |                         []                         |
-     gpe-beam           |                         []    []                   |
-     gpe-calendar       |                         []    []                   |
-     gpe-clock          |                         []    []                   |
-     gpe-conf           |                         []    []                   |
-     gpe-contacts       |                         []    []                   |
+     gcc                |                                  []                |
+     gettext-examples   | []                   []          [] []          [] |
+     gettext-runtime    |             []       []       [] []             [] |
+     gettext-tools      |                      []          []                |
+     gimp-print         |                         []    [] []        []      |
+     gip                |                []                                  |
+     gliv               |                                  []                |
+     glunarclock        |                []                                  |
+     gmult              | []                               []                |
+     gnubiff            |                                  ()                |
+     gnucash            |                                  () ()     []      |
+     gnucash-glossary   |                               [] ()                |
+     gnuedu             |                                                    |
+     gnulib             | []          [] []    []       [] []                |
+     gnunet-gtk         |                                                    |
+     gnutls             |                                                    |
+     gpe-aerial         |                         []       []                |
+     gpe-beam           |                         []       []                |
+     gpe-calendar       |                                                    |
+     gpe-clock          |                         []       []                |
+     gpe-conf           |                         []       []                |
+     gpe-contacts       |                                                    |
      gpe-edit           |                         []                         |
+     gpe-filemanager    |                                                    |
      gpe-go             |                         []                         |
-     gpe-login          |                         []    []                   |
-     gpe-ownerinfo      |                         []    []                   |
-     gpe-sketchbook     |                         []    []                   |
-     gpe-su             |                         []    []                   |
-     gpe-taskmanager    |                         []    []                   |
+     gpe-login          |                         []       []                |
+     gpe-ownerinfo      |                         []       []                |
+     gpe-package        |                                                    |
+     gpe-sketchbook     |                         []       []                |
+     gpe-su             |                         []       []                |
+     gpe-taskmanager    |                         []       []                |
      gpe-timesheet      |                         []                         |
-     gpe-today          |                         []    []                   |
-     gpe-todo           |                         []    []                   |
-     gphoto2            |                         [] [] []                [] |
-     gprof              |                            [] []                [] |
-     gpsdrive           |                               ()    ()          () |
-     gramadoir          |                               []                   |
-     grep               |             [] []    []       [] []             [] |
-     gretl              |                                                 [] |
-     gtick              | []                            ()                   |
-     hello              |                      []    [] [] []          [] [] |
-     id-utils           |                            [] []                   |
-     indent             |                      []       []             [] [] |
-     iso_3166           |          []    [] [] [] [] [] [] []          [] [] |
-     iso_3166_1         |                      [] [] [] [] []             [] |
+     gpe-today          |                         []       []                |
+     gpe-todo           |                                                    |
+     gphoto2            |                         []    [] []        []      |
+     gprof              |                               [] []                |
+     gpsdrive           |                                  ()    ()          |
+     gramadoir          | []                               []                |
+     grep               | []          [] []    []          [] []             |
+     gretl              |                                                    |
+     gsasl              |                                                    |
+     gss                |                                                    |
+     gst-plugins        | []                   [] []    []                   |
+     gst-plugins-base   |                []    []       []                   |
+     gst-plugins-good   | []       []    []    [] []    []           []      |
+     gstreamer          | []             []    [] []    [] []        []      |
+     gtick              |                                  ()                |
+     gtkam              |                         []    [] []                |
+     gtkorphan          |                []                []                |
+     gtkspell           |             []                   [] []          [] |
+     gutenprint         |                               []                   |
+     hello              |                []    []       [] []             [] |
+     id-utils           |                               [] []                |
+     impost             |                                                    |
+     indent             |                      []          []             [] |
+     iso_3166           |                                  []             [] |
      iso_3166_2         |                                                    |
-     iso_3166_3         |                               []                   |
-     iso_4217           |                      []    [] []                [] |
-     iso_639            |                                                    |
-     jpilot             |                         [] []                   [] |
+     iso_4217           |                                  []                |
+     iso_639            |                                  []             [] |
+     jpilot             |                         []                         |
      jtag               |                                                    |
-     jwhois             |                                                 [] |
-     kbd                |                         [] [] [] []             [] |
-     latrine            |                               ()                   |
-     ld                 |                            []                   [] |
-     libc               |                      [] [] [] [] []             [] |
-     libgpewidget       |                         []    []                   |
-     libiconv           |                      []    [] []             [] [] |
-     lifelines          |                            [] ()                   |
-     lilypond           |                               []                   |
+     jwhois             |                                                    |
+     kbd                |                         []    [] [] []             |
+     keytouch           |                                                    |
+     keytouch-editor    |                                                    |
+     keytouch-keyboa... |                                                    |
+     latrine            |                                  ()                |
+     ld                 |                               []                   |
+     leafpad            |                []    [] []       [] []             |
+     libc               |                      [] []    [] [] []             |
+     libexif            |                                  []                |
+     libextractor       |                                  []                |
+     libgpewidget       |                         []    [] []                |
+     libgpg-error       |                                  []                |
+     libgphoto2         |                               [] []                |
+     libgphoto2_port    |                               [] []                |
+     libgsasl           |                                                    |
+     libiconv           |                                  []             [] |
+     libidn             |                               []                [] |
+     lifelines          |                               [] ()                |
+     lilypond           |                                  []                |
      lingoteach         |                                                    |
-     lingoteach_lessons |                               ()                () |
-     lynx               |                      [] [] [] []                   |
-     m4                 |                         [] [] [] []                |
-     mailutils          |                      []                         [] |
-     make               |                            [] []                [] |
-     man-db             |                      [] () [] []                () |
-     minicom            |                         []    []                [] |
-     mysecretdiary      |                            [] []                [] |
-     nano               |                      [] () [] []                [] |
-     nano_1_0           |                      [] () [] []                [] |
-     opcodes            |                                                 [] |
-     parted             |                      [] [] [] []                [] |
-     ptx                |                      []    [] []             [] [] |
+     lynx               |                      [] []    [] []                |
+     m4                 |                         []    [] [] []             |
+     mailutils          |                      []                            |
+     make               |                               [] []                |
+     man-db             |                      [] ()    [] []                |
+     minicom            |                         []    [] []                |
+     mysecretdiary      |                               [] []                |
+     nano               |                []    []          []                |
+     nano_1_0           |                      [] ()    [] []                |
+     opcodes            |                                  []                |
+     parted             |                                                    |
+     pilot-qof          |                                            []      |
+     psmisc             |                []                                  |
+     pwdutils           |                                                    |
      python             |                                                    |
-     radius             |                                                 [] |
-     recode             |             []       []    [] [] []          [] [] |
-     rpm                |                         [] []                      |
+     qof                |                                                    |
+     radius             |                      []                            |
+     recode             |             []       []       [] [] []          [] |
+     rpm                |                         []    []                   |
      screem             |                                                    |
-     scrollkeeper       |             []       [] [] [] []                [] |
-     sed                | []                   []    [] []             [] [] |
-     sh-utils           |                            [] []                [] |
-     shared-mime-info   |                                                    |
-     sharutils          |                      [] [] [] [] []             [] |
-     silky              |                               ()                   |
-     skencil            |                            [] ()                [] |
-     sketch             |                            [] ()                [] |
-     soundtracker       |                            [] []                [] |
-     sp                 |                               []                   |
-     tar                |                         [] [] []                [] |
-     texinfo            |                            [] []             []    |
-     textutils          |                      []    [] []                [] |
-     tin                |                               ()        ()         |
-     tp-robot           |                                                    |
-     tuxpaint           |                      [] [] [] [] []     []      [] |
+     scrollkeeper       |          [] []       [] [] [] [] []        []      |
+     sed                |                      []          []             [] |
+     sh-utils           |                               [] []                |
+     shared-mime-info   |                []       []                 []   [] |
+     sharutils          |                []    [] []    [] [] []             |
+     shishi             |                                                    |
+     silky              |                                                    |
+     skencil            |                               [] ()                |
+     sketch             |                               [] ()                |
+     solfege            |                                                    |
+     soundtracker       |                               [] []                |
+     sp                 |                                  []                |
+     stardict           |                         []                         |
+     system-tools-ba... |       []       [] [] [] []    [] [] []     []      |
+     tar                |                []                                  |
+     texinfo            |                               [] []             [] |
+     textutils          |                      []       [] []                |
+     tin                |                                  ()        ()      |
+     tp-robot           |                                  []                |
+     tuxpaint           | []             []             [] []        []      |
      unicode-han-tra... |                                                    |
      unicode-transla... |                                                    |
-     util-linux         |                      [] [] [] []                [] |
-     vorbis-tools       |             []          [] []                   [] |
-     wastesedge         |                               ()                   |
-     wdiff              |                      []    [] []                [] |
-     wget               |                []    []    [] [] []             [] |
-     xchat              |                      []       [] []             [] |
-     xfree86_xkb_xml    |                         [] []                      |
-     xpad               |                                                 [] |
+     util-linux         |                      [] []    [] []                |
+     vorbis-tools       |             []          []    []           []      |
+     wastesedge         |                                  ()                |
+     wdiff              |                      []       [] []        []      |
+     wget               |                      []          []                |
+     xchat              |             [] []    []          [] []     []      |
+     xkeyboard-config   |                                                    |
+     xpad               |                []             []                   |
                         +----------------------------------------------------+
-                          af am ar az be bg bs ca cs da de el en en_GB eo es
-                           4  0  0  1  9  4  1 40 41 60 78 17  1   5   13 68
-     
-                          et eu fa fi fr ga gl he hr hu id is it ja ko lg
+                          af am ar az be bg bs ca cs cy da de el en en_GB eo
+                          10  0  1  2  9 22  1 42 41  2 60 95 16  1  17   16
+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                        +--------------------------------------------------+
+     GNUnet             |                                                  |
+     a2ps               |    []       [] []                             () |
+     aegis              |                                                  |
+     ant-phone          |                []                                |
+     anubis             |                []                                |
+     ap-utils           |             [] []                                |
+     aspell             |                []  []                         [] |
+     bash               | []             []                    []          |
+     batchelor          |                []  []                            |
+     bfd                | []                                               |
+     bibshelf           | []                 []                         [] |
+     binutils           | []          [] []                                |
+     bison              | [] []          []  []                   []    [] |
+     bison-runtime      |    []          []  []                   []    [] |
+     bluez-pin          |             [] []  []                [] []       |
+     cflow              |                    []                            |
+     clisp              | []             []                                |
+     console-tools      |                                                  |
+     coreutils          | [] []       [] []  []                []          |
+     cpio               | []             []  []                            |
+     cpplib             | []             []                                |
+     cryptonit          |                []                                |
+     darkstat           | []             ()  []                [] []       |
+     dialog             | [] [] []    [] []  []                []       [] |
+     diffutils          | []          [] []  [] []    []       [] []    [] |
+     doodle             |                    []                         [] |
+     e2fsprogs          | []             []                             [] |
+     enscript           |                []  []             []             |
+     error              | []          [] []  []                []          |
+     fetchmail          | []                                               |
+     fileutils          | [] []          []  []                []       [] |
+     findutils          |    []          []  []                []          |
+     flex               | []             []  []                            |
+     fslint             |                []                                |
+     gas                | []             []                                |
+     gawk               | []             []  []       []                   |
+     gbiff              |                []                                |
+     gcal               | []             []                                |
+     gcc                | []                                               |
+     gettext-examples   | []             []  []                [] []    [] |
+     gettext-runtime    | []          [] []  []                   []    [] |
+     gettext-tools      | []             []                             [] |
+     gimp-print         | []             []                                |
+     gip                | []    []       []                                |
+     gliv               |                ()                                |
+     glunarclock        |             []     []                []          |
+     gmult              |       []       []                             [] |
+     gnubiff            |                ()                             () |
+     gnucash            | ()             ()                    ()          |
+     gnucash-glossary   | []                                            [] |
+     gnuedu             | []                                               |
+     gnulib             | [] [] []    [] []  [] []             []          |
+     gnunet-gtk         |                                                  |
+     gnutls             |                                                  |
+     gpe-aerial         | []             []                                |
+     gpe-beam           | []             []                                |
+     gpe-calendar       |                                                  |
+     gpe-clock          | []          [] []                    []          |
+     gpe-conf           |                []                                |
+     gpe-contacts       | []             []                                |
+     gpe-edit           | []             []                    [] []       |
+     gpe-filemanager    | []                                               |
+     gpe-go             | []             []                    []          |
+     gpe-login          | []             []                    []          |
+     gpe-ownerinfo      | []          [] []                    [] []       |
+     gpe-package        | []                                               |
+     gpe-sketchbook     | []             []                                |
+     gpe-su             | []          [] []                    []          |
+     gpe-taskmanager    | []          [] []                                |
+     gpe-timesheet      | []             []  []                   []       |
+     gpe-today          | []          [] []  []                            |
+     gpe-todo           | []                                               |
+     gphoto2            | []          [] []                    []       [] |
+     gprof              | []             []  []                   []       |
+     gpsdrive           | ()             ()                    []       () |
+     gramadoir          |                []  []                            |
+     grep               | [] [] []    [] []  [] []    []    [] [] []    [] |
+     gretl              | []             []                             [] |
+     gsasl              |                    []                   []       |
+     gss                |                []                                |
+     gst-plugins        |                []                    []       [] |
+     gst-plugins-base   |                                      []       [] |
+     gst-plugins-good   |       []                             []       [] |
+     gstreamer          |             []                       []       [] |
+     gtick              |                    []                            |
+     gtkam              | []             []                    []       [] |
+     gtkorphan          |                []                             [] |
+     gtkspell           | []    []    [] []  []                         [] |
+     gutenprint         |                                      []          |
+     hello              | [] [] [] [] [] []  [] []    []    [] [] []    [] |
+     id-utils           |                []  []                [] []    [] |
+     impost             |                []  []                            |
+     indent             | [] [] []    [] []  [] []             [] []    [] |
+     iso_3166           |             [] []                    []          |
+     iso_3166_2         |                []                                |
+     iso_4217           |    []       []        []             []          |
+     iso_639            |          [] [] []  []                []          |
+     jpilot             | []             []                                |
+     jtag               |                []                                |
+     jwhois             | []             []                    [] []    [] |
+     kbd                | []             []                                |
+     keytouch           |                    []                            |
+     keytouch-editor    |                    []                            |
+     keytouch-keyboa... |                    []                            |
+     latrine            |                []  []                         [] |
+     ld                 | []             []                                |
+     leafpad            | []             []  []       []       []       [] |
+     libc               | []          [] []     []             []          |
+     libexif            | []                                               |
+     libextractor       |                    []                            |
+     libgpewidget       | []             []  []                [] []       |
+     libgpg-error       |                                                  |
+     libgphoto2         | []             []                             [] |
+     libgphoto2_port    |                []                             [] |
+     libgsasl           |                []  []                            |
+     libiconv           |    []              []                            |
+     libidn             |                []                             [] |
+     lifelines          |                ()                                |
+     lilypond           |                []                                |
+     lingoteach         |                []                       []    [] |
+     lynx               |    []                                []       [] |
+     m4                 |                []  [] []                []       |
+     mailutils          | []             []                                |
+     make               | []          [] []  [] []    []    []    []       |
+     man-db             | ()                                               |
+     minicom            | []          [] []                    []          |
+     mysecretdiary      | []             []                       []       |
+     nano               | []    []       []  []                []       [] |
+     nano_1_0           | []             []     []                []    [] |
+     opcodes            | []          [] []  []                            |
+     parted             | []             []                       []    [] |
+     pilot-qof          |                                                  |
+     psmisc             |       []                             []       [] |
+     pwdutils           |                                                  |
+     python             |                                                  |
+     qof                |                                         []       |
+     radius             | []             []                                |
+     recode             | []             []  [] []    []       [] []    [] |
+     rpm                |                []                       []       |
+     screem             |                                                  |
+     scrollkeeper       | []          []                       []          |
+     sed                | [] []          []  []                []          |
+     sh-utils           | [] []       [] []  []                []       [] |
+     shared-mime-info   | []    []    [] []                    []       [] |
+     sharutils          | [] []       [] []  [] []             []       [] |
+     shishi             |                                                  |
+     silky              |                []                                |
+     skencil            | []             []                                |
+     sketch             | []             []                                |
+     solfege            |                                               [] |
+     soundtracker       | []             []                             [] |
+     sp                 |                []                                |
+     stardict           |                                      []          |
+     system-tools-ba... | []    []    [] []                 [] [] []    [] |
+     tar                | [] []       [] []  []                []       [] |
+     texinfo            |                []           []                   |
+     textutils          | []             []  [] []             []          |
+     tin                |    []          ()                                |
+     tp-robot           |             [] []  []                []          |
+     tuxpaint           |                    []                []          |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                []  []                            |
+     util-linux         | [] []       [] []                    [] []    [] |
+     vorbis-tools       | []             []                                |
+     wastesedge         |                ()                                |
+     wdiff              | [] []          []  [] []             [] []    [] |
+     wget               |    []       [] []  []             [] [] []    [] |
+     xchat              | []    []    [] []        []    []    []       [] |
+     xkeyboard-config   |             [] []                    []       [] |
+     xpad               | []                 []                []          |
+                        +--------------------------------------------------+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                          88 22 14  2 40 115 61 14  1  8  1  6 59 31  0 52
+
+                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
                         +-------------------------------------------------+
-     a2ps               | []       [] []                      ()    ()    |
-     aegis              |                                                 |
-     ant-phone          |             []                                  |
-     anubis             |             []                                  |
-     ap-utils           |             []                                  |
-     aspell             |             [] []                               |
-     bash               |             []             []                   |
-     batchelor          |             [] []                               |
-     bfd                |             []                                  |
-     binutils           |             []                         []       |
-     bison              | []          []                []    []          |
-     bluez-pin          |          [] [] []          [] []                |
-     clisp              |                                                 |
-     clisp              |             []                                  |
+     GNUnet             |                                                 |
+     a2ps               |    ()                      []          []    () |
+     aegis              |                                        ()       |
+     ant-phone          |                                        []       |
+     anubis             |                            []    []    []       |
+     ap-utils           |                            []                   |
+     aspell             |                         []             []       |
+     bash               |                                        []       |
+     batchelor          |                            []          []       |
+     bfd                |                                                 |
+     bibshelf           |                            []                   |
+     binutils           |                                                 |
+     bison              |                            []    []    []       |
+     bison-runtime      |                            []    []    []       |
+     bluez-pin          |       []                   []          []       |
+     cflow              |                                                 |
+     clisp              |                                        []       |
      console-tools      |                                                 |
-     coreutils          | []       [] [] []                   [] []       |
-     cpio               |             []    []       []             []    |
-     darkstat           |             () []          [] []                |
-     diffutils          |          [] []    [] []    [] []       []       |
-     e2fsprogs          |                                                 |
-     enscript           |             []          []                      |
-     error              |          [] [] []          []                   |
-     fetchmail          |                                        []       |
-     fileutils          | []          [] []          []       [] []       |
-     findutils          | []       [] [] [] []    [] [] []    [] [] []    |
-     flex               |             [] []                         []    |
-     fslint             |             []                                  |
-     gas                |             []                                  |
-     gawk               |             []       []                []       |
-     gbiff              |             []                                  |
-     gcal               |             []                                  |
-     gcc                |             []                                  |
-     gettext            |             []                         [] []    |
-     gettext-examples   |             []                         []       |
-     gettext-runtime    |          [] []                []       [] []    |
-     gettext-tools      |             []                         [] []    |
-     gimp-print         |             []                         []       |
-     gliv               |             ()                                  |
-     glunarclock        |          []    [] []       []                   |
-     gnubiff            |             []                                  |
-     gnucash            |             ()                      []          |
-     gnucash-glossary   |                                     []          |
-     gnupg              | []       [] []    []          []    [] []       |
-     gpe-aerial         |             []                                  |
-     gpe-beam           |             []                                  |
-     gpe-calendar       |             []             [] []                |
-     gpe-clock          |             []                                  |
-     gpe-conf           |             []                                  |
-     gpe-contacts       |             []             []                   |
-     gpe-edit           |             []                []                |
-     gpe-go             |             []                                  |
-     gpe-login          |             []             []                   |
-     gpe-ownerinfo      |             []             [] []                |
-     gpe-sketchbook     |             []                                  |
-     gpe-su             |             []                                  |
-     gpe-taskmanager    |             []                                  |
-     gpe-timesheet      |             [] []             []                |
-     gpe-today          |             [] []                               |
-     gpe-todo           |             []                []                |
-     gphoto2            |             []             []          []       |
-     gprof              |             []                []                |
-     gpsdrive           |             ()                      () ()       |
-     gramadoir          |             [] []                               |
-     grep               | []       [] [] [] [] [] [] [] []    [] []       |
-     gretl              |             []                      []          |
-     gtick              |          [] [] []                               |
-     hello              | []    [] [] [] [] [] [] [] [] []    [] [] []    |
-     id-utils           |             []             [] []    []          |
-     indent             | []       [] [] [] []       [] []    [] []       |
-     iso_3166           |    []       [] []       [] [] []    []          |
-     iso_3166_1         |    []       [] []          [] []                |
-     iso_3166_2         |                                                 |
-     iso_3166_3         |                                                 |
-     iso_4217           | []          []    []       []       [] []       |
-     iso_639            |                                                 |
-     jpilot             |             []                         ()       |
-     jtag               |             []                                  |
-     jwhois             |             []             [] []    []          |
-     kbd                |             []                                  |
-     latrine            |             []                                  |
-     ld                 |             []                                  |
-     libc               |          [] []    []       []          [] []    |
-     libgpewidget       |             [] []          [] []                |
-     libiconv           | []       [] [] [] []    [] [] []    []          |
-     lifelines          |             ()                                  |
-     lilypond           |             []                                  |
-     lingoteach         |             []                []                |
-     lingoteach_lessons |                                                 |
-     lynx               | []                         []       [] []       |
-     m4                 |             []    []          []       []       |
+     coreutils          |                                        []       |
+     cpio               |                                                 |
+     cpplib             |                                        []       |
+     cryptonit          |                                        []       |
+     darkstat           |                            []          []       |
+     dialog             |                            []          []       |
+     diffutils          | []                         []          []       |
+     doodle             |                                                 |
+     e2fsprogs          |                                        []       |
+     enscript           |                                        []       |
+     error              |                                        []       |
+     fetchmail          | []                                     []       |
+     fileutils          | []          []                                  |
+     findutils          |                                        []       |
+     flex               |    []                                  []       |
+     fslint             |                            []          []       |
+     gas                |                                                 |
+     gawk               | []                                     []       |
+     gbiff              |                                        []       |
+     gcal               |                                                 |
+     gcc                |                                                 |
+     gettext-examples   | []                                     []       |
+     gettext-runtime    | [] []                                  []       |
+     gettext-tools      | [] []                                           |
+     gimp-print         | []                                     []       |
+     gip                |                            []          []       |
+     gliv               |                                        []       |
+     glunarclock        |                            []          []       |
+     gmult              | []                         []                   |
+     gnubiff            |                                                 |
+     gnucash            | ()                               ()             |
+     gnucash-glossary   |                                        []       |
+     gnuedu             |                                                 |
+     gnulib             | [] []                      []          []       |
+     gnunet-gtk         |                                                 |
+     gnutls             |                                                 |
+     gpe-aerial         |                                        []       |
+     gpe-beam           |                                        []       |
+     gpe-calendar       | []                                              |
+     gpe-clock          | [] []                                  []       |
+     gpe-conf           |    []                                  []       |
+     gpe-contacts       |    []                                           |
+     gpe-edit           | [] []                                  []       |
+     gpe-filemanager    | [] []                                           |
+     gpe-go             | [] []                                  []       |
+     gpe-login          | [] []                                  []       |
+     gpe-ownerinfo      | []                                     []       |
+     gpe-package        | [] []                                           |
+     gpe-sketchbook     |    []                                  []       |
+     gpe-su             | [] []                                  []       |
+     gpe-taskmanager    | [] [] []                               []       |
+     gpe-timesheet      |                                        []       |
+     gpe-today          | []                                     []       |
+     gpe-todo           | []                                              |
+     gphoto2            | []                                     []       |
+     gprof              |                                                 |
+     gpsdrive           | ()                                     ()    () |
+     gramadoir          |                                        ()       |
+     grep               | []       []                      []    []       |
+     gretl              |                                                 |
+     gsasl              |                                        []       |
+     gss                |                                                 |
+     gst-plugins        |                                        []       |
+     gst-plugins-base   |                                                 |
+     gst-plugins-good   |                                        []       |
+     gstreamer          |                                        []       |
+     gtick              |                                                 |
+     gtkam              | []                                              |
+     gtkorphan          |                                        []       |
+     gtkspell           |                         []             []       |
+     gutenprint         |                                                 |
+     hello              | [] []                      []    []    [] []    |
+     id-utils           |                                        []       |
+     impost             |                                                 |
+     indent             | []                                     []       |
+     iso_3166           |                                        []       |
+     iso_3166_2         |                                        []       |
+     iso_4217           | []                      []             []       |
+     iso_639            | []                                     []       |
+     jpilot             | ()                                     ()    () |
+     jtag               |                                                 |
+     jwhois             |                                        []       |
+     kbd                |                                        []       |
+     keytouch           |                                        []       |
+     keytouch-editor    |                                                 |
+     keytouch-keyboa... |                                                 |
+     latrine            |                                        []       |
+     ld                 |                                                 |
+     leafpad            | []             []                               |
+     libc               | [] []                            []    []    [] |
+     libexif            |                                                 |
+     libextractor       |                                                 |
+     libgpewidget       |                                        []       |
+     libgpg-error       |                                                 |
+     libgphoto2         | []                                              |
+     libgphoto2_port    | []                                              |
+     libgsasl           |                                        []       |
+     libiconv           |                                                 |
+     libidn             | []                                     []       |
+     lifelines          |                                        []       |
+     lilypond           |                                                 |
+     lingoteach         |                                        []       |
+     lynx               | []                                     []       |
+     m4                 | []                                     []       |
      mailutils          |                                                 |
-     make               |             []    [] [] []             [] []    |
-     man-db             |                                     () ()       |
-     minicom            |          [] []             []          []       |
-     mysecretdiary      |             []                []                |
-     nano               |             []    []          []    []          |
-     nano_1_0           |             []    []          []    []          |
-     opcodes            |             []                                  |
-     parted             |             []    []                   []       |
-     ptx                | []       [] [] [] []       [] []                |
+     make               | [] []                                  []       |
+     man-db             | ()                                              |
+     minicom            | []                                              |
+     mysecretdiary      |                                        []       |
+     nano               |                            []    []    []       |
+     nano_1_0           |                            []    []       []    |
+     opcodes            |                                        []       |
+     parted             | []                                     []       |
+     pilot-qof          |                                                 |
+     psmisc             | []                               []    []       |
+     pwdutils           |                                                 |
      python             |                                                 |
-     radius             |             []                                  |
-     recode             |             []    [] []    [] []    []          |
-     rpm                |             []                            []    |
-     screem             |                                                 |
-     scrollkeeper       |                            []                   |
-     sed                | []       [] [] [] []       [] []    [] []       |
-     sh-utils           | []       [] [] []          []       [] []       |
-     shared-mime-info   |          [] []             []                   |
-     sharutils          | []          []    []       []          []       |
-     silky              |          () []             ()       ()          |
-     skencil            |             []                                  |
-     sketch             |             []                                  |
-     soundtracker       |             []                      []          |
-     sp                 |             []                         ()       |
-     tar                | []       [] []    []    [] [] []    [] []       |
-     texinfo            |             []       [] []             []       |
-     textutils          |             [] [] []       []          [] []    |
-     tin                | []          ()                                  |
-     tp-robot           |             []                                  |
-     tuxpaint           |          [] []       []    [] [] [] [] [] []    |
+     qof                |                                                 |
+     radius             |                                                 |
+     recode             |                                        []       |
+     rpm                | [] []                                           |
+     screem             | []                                              |
+     scrollkeeper       |                                  [] [] [] []    |
+     sed                | []                                     []       |
+     sh-utils           | []                               []             |
+     shared-mime-info   |    []          []                []    [] []    |
+     sharutils          | []                                     []       |
+     shishi             |                                                 |
+     silky              |                                        []       |
+     skencil            |                                                 |
+     sketch             |                                                 |
+     solfege            |                                                 |
+     soundtracker       |                                                 |
+     sp                 | ()                                              |
+     stardict           |                      []                []       |
+     system-tools-ba... | [] []          []                      []       |
+     tar                | []       []                            []       |
+     texinfo            | []                               []    []       |
+     textutils          | [] []                            []             |
+     tin                |                                                 |
+     tp-robot           |                                        []       |
+     tuxpaint           |                                           []    |
      unicode-han-tra... |                                                 |
-     unicode-transla... |             [] []                               |
-     util-linux         | []       [] []             []       () []       |
-     vorbis-tools       |             []                                  |
-     wastesedge         |             ()                                  |
-     wdiff              | []          [] [] []       [] []                |
-     wget               | []       [] []    []    [] []          []       |
-     xchat              | []       [] []                                  |
-     xfree86_xkb_xml    |             []             []                   |
-     xpad               |             [] []                               |
+     unicode-transla... |                                                 |
+     util-linux         | []                                     []       |
+     vorbis-tools       |                                        []       |
+     wastesedge         |                                        []       |
+     wdiff              |                            []    []             |
+     wget               | []                                     []       |
+     xchat              | [] []                []                []       |
+     xkeyboard-config   |                                        []       |
+     xpad               |    []                      []          []       |
                         +-------------------------------------------------+
-                          et eu fa fi fr ga gl he hr hu id is it ja ko lg
-                          22  2  1 26 106 28 24  8 10 41 33  1 26 33 12  0
-     
-                          lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
-                        +-----------------------------------------------------+
-     a2ps               |             []       []    ()     ()     []   [] [] |
-     aegis              |                      ()                       () () |
-     ant-phone          |                      []                       []    |
-     anubis             |             []    [] []           []          [] [] |
-     ap-utils           |                      []           ()          []    |
-     aspell             |                      []                             |
-     bash               |                                          []   [] [] |
-     batchelor          |                                               []    |
-     bfd                |                                               []    |
-     binutils           |                                                  [] |
-     bison              |             []       []                  []   [] [] |
-     bluez-pin          |                      []           []          []    |
-     clisp              |                                                     |
-     clisp              |                      []                             |
-     console-tools      |                                                  [] |
-     coreutils          |                                   []             [] |
-     cpio               |                      []           []     []   [] [] |
-     darkstat           |             []       []                  []   []    |
-     diffutils          |             []       []           []     []   [] [] |
-     e2fsprogs          |                                   []                |
-     enscript           |                      []                  []   [] [] |
-     error              |                      []                  []   []    |
-     fetchmail          |                      []           []     ()      [] |
-     fileutils          |                                   []          [] [] |
-     findutils          |                      []           []     []   [] [] |
-     flex               |                                   []     []   [] [] |
-     fslint             |                      []                       []    |
-     gas                |                                                     |
-     gawk               |                                   []     []   []    |
-     gbiff              |                      []                       []    |
-     gcal               |                                                     |
-     gcc                |                                                     |
-     gettext            |                                   []          [] [] |
-     gettext-examples   |                      []           []          []    |
-     gettext-runtime    |                      []           []          [] [] |
-     gettext-tools      |                                   []          []    |
-     gimp-print         |                      []                             |
-     gliv               |                      []                  []   []    |
-     glunarclock        |             []       []                       [] [] |
-     gnubiff            |                      []                             |
-     gnucash            |                      []              []  ()      [] |
-     gnucash-glossary   |                      []              []             |
-     gnupg              |                                               []    |
-     gpe-aerial         |                      []              []       [] [] |
-     gpe-beam           |                      []              []       [] [] |
-     gpe-calendar       |                      []              []       [] [] |
-     gpe-clock          |                      []              []       [] [] |
-     gpe-conf           |                      []              []       [] [] |
-     gpe-contacts       |                      []              []       [] [] |
-     gpe-edit           |                      []              []       [] [] |
-     gpe-go             |                      []                       [] [] |
-     gpe-login          |                      []              []       [] [] |
-     gpe-ownerinfo      |                      []              []       [] [] |
-     gpe-sketchbook     |                      []              []       [] [] |
-     gpe-su             |                      []              []       [] [] |
-     gpe-taskmanager    |                      []              []       [] [] |
-     gpe-timesheet      |                      []              []       [] [] |
-     gpe-today          |                      []              []       [] [] |
-     gpe-todo           |                      []              []       [] [] |
-     gphoto2            |                                               []    |
-     gprof              |                                          []   []    |
-     gpsdrive           |                      ()    ()                 []    |
-     gramadoir          |                      ()                       []    |
-     grep               |                                   [] []  []   [] [] |
-     gretl              |                                                     |
-     gtick              |                      []                       [] [] |
-     hello              |    []       []    [] [] [] []     []     []   [] [] |
-     id-utils           |                      []                  []   [] [] |
-     indent             |                      []                  []   [] [] |
-     iso_3166           |          []                [] []                    |
-     iso_3166_1         |                      []    []                       |
-     iso_3166_2         |                                                     |
-     iso_3166_3         |                      []                             |
-     iso_4217           |          []          [] [] []     [] []  []      [] |
-     iso_639            |          []                                         |
-     jpilot             |                      ()    ()                       |
-     jtag               |                                                     |
-     jwhois             |                      []           []     []   [] () |
-     kbd                |                      []           []          []    |
-     latrine            |                                               []    |
-     ld                 |                                                     |
-     libc               |                   []       []     []     []         |
-     libgpewidget       |                      []              []       []    |
-     libiconv           |                      []           []     []   [] [] |
-     lifelines          |                                                     |
-     lilypond           |                                                     |
-     lingoteach         |                                                     |
-     lingoteach_lessons |                                                     |
-     lynx               |                      []                  []      [] |
-     m4                 |                      []           []     []   [] [] |
-     mailutils          |                                   []          [] [] |
-     make               |                      []           []     []      [] |
-     man-db             |                                               []    |
-     minicom            |                                   []     []   [] [] |
-     mysecretdiary      |                      []                  []   []    |
-     nano               |             []       []           []          [] [] |
-     nano_1_0           |             []    []    []        []          [] [] |
-     opcodes            |                      []                       []    |
-     parted             |                         []        [] []  []         |
-     ptx                |                   [] []    []     [] []  []   [] [] |
-     python             |                                                     |
-     radius             |                                   []             [] |
-     recode             |                                   []     []   [] [] |
-     rpm                |                                   [] []          [] |
-     screem             |                                                     |
-     scrollkeeper       |                   [] []           []          [] [] |
-     sed                |                                   []     []   []    |
-     sh-utils           |                   []                             [] |
-     shared-mime-info   |                      [] []                          |
-     sharutils          |                      []                          [] |
-     silky              |                                                  () |
-     skencil            |                                      []  []         |
-     sketch             |                                      []  []         |
-     soundtracker       |                                                     |
-     sp                 |                                                     |
-     tar                |             []    []       []     []     []   []    |
-     texinfo            |                   []              []          [] [] |
-     textutils          |                   []                             [] |
-     tin                |                                                     |
-     tp-robot           |                      []                             |
-     tuxpaint           | []          []       [] []        [] []  []   []    |
-     unicode-han-tra... |                                                     |
-     unicode-transla... |                                                     |
-     util-linux         |                      []                  []      [] |
-     vorbis-tools       |                      []                       [] [] |
-     wastesedge         |                                                     |
-     wdiff              |             []                    []     []   [] [] |
-     wget               |                                   []          [] [] |
-     xchat              |    []                []                          [] |
-     xfree86_xkb_xml    |                      []                          [] |
-     xpad               |                      []                       []    |
-                        +-----------------------------------------------------+
-                          lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
-                           1  2  0  3 12  0 10 69  6  7  1  40 26  36   76 63
-     
-                          sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
-                        +-----------------------------------------------------+
-     a2ps               |    []    []       [] []                             | 16
-     aegis              |                                                     |  0
-     ant-phone          |                                                     |  3
-     anubis             |                   [] []                             |  9
-     ap-utils           |                      ()                             |  3
-     aspell             |                                                     |  4
-     bash               |                                                     |  9
-     batchelor          |                                                     |  3
-     bfd                |          []       []                                |  6
-     binutils           |          []       []                  []            |  8
-     bison              |          []       []                                | 14
-     bluez-pin          | []       []                    []                   | 14
-     clisp              |                                                     |  0
-     clisp              |                                                     |  5
-     console-tools      |                                                     |  3
-     coreutils          |    []    []       []                        []      | 16
-     cpio               |          []                           []            | 14
-     darkstat           | []    [] []                           ()    ()      | 12
-     diffutils          |          []       []                        []      | 23
-     e2fsprogs          |          []       []                                |  6
-     enscript           |          []       []                                | 12
-     error              | []                []                        []      | 15
-     fetchmail          | []                []                                | 11
-     fileutils          |    []    []       []                  []    []      | 17
-     findutils          | [] [] [] []       []                  []            | 29
-     flex               |          []       []                                | 13
-     fslint             |                                                     |  3
-     gas                |                   []                                |  3
-     gawk               |          []       []                                | 12
-     gbiff              |                                                     |  4
-     gcal               |          []       []                                |  4
-     gcc                |                   []                                |  4
-     gettext            | [] []    []       []                        []      | 16
-     gettext-examples   | []    [] []       []                  []            | 14
-     gettext-runtime    | [] [] [] []       [] []               []    []      | 22
-     gettext-tools      | [] [] [] []       []                  []            | 14
-     gimp-print         | []       []                                         | 10
-     gliv               |                                                     |  3
-     glunarclock        |       [] []                    []                   | 13
-     gnubiff            |                                                     |  3
-     gnucash            | []                                          []      |  9
-     gnucash-glossary   | []       []                                 []      |  8
-     gnupg              | []       []       []                        []      | 17
-     gpe-aerial         |          []                                         |  7
-     gpe-beam           |          []                                         |  8
-     gpe-calendar       | []       []                    []           []      | 13
-     gpe-clock          | []    [] []                                         | 10
-     gpe-conf           | []       []                                         |  9
-     gpe-contacts       | []       []                                 []      | 11
-     gpe-edit           | []    [] []                    []           []      | 12
-     gpe-go             |                                                     |  5
-     gpe-login          | []    [] []                    []           []      | 13
-     gpe-ownerinfo      | []    [] []                                 []      | 13
-     gpe-sketchbook     | []       []                                         |  9
-     gpe-su             | []    [] []                                         | 10
-     gpe-taskmanager    | []    [] []                                         | 10
-     gpe-timesheet      | []    [] []                                 []      | 12
-     gpe-today          | []    [] []                    []           []      | 13
-     gpe-todo           | []       []                    []           []      | 12
-     gphoto2            | []       []                           []            | 11
-     gprof              |          []       []                                |  9
-     gpsdrive           | []       []                                         |  3
-     gramadoir          | []                                                  |  5
-     grep               |    [] []          [] []                             | 26
-     gretl              |                                                     |  3
-     gtick              |                                                     |  7
-     hello              | []    [] []       [] []                             | 34
-     id-utils           |          []       []                                | 12
-     indent             | []    [] []       []                                | 21
-     iso_3166           | [] [] [] []       []    []     []                   | 27
-     iso_3166_1         | [] []             []                                | 16
-     iso_3166_2         |                                                     |  0
-     iso_3166_3         |                                                     |  2
-     iso_4217           | [] []    []       [] []               []            | 24
-     iso_639            |                                                     |  1
-     jpilot             |          []       []        []        []    []      |  9
-     jtag               | []                                                  |  2
-     jwhois             |          ()       []                        []      | 11
-     kbd                |          []       []                                | 11
-     latrine            |                                                     |  2
-     ld                 |          []       []                                |  5
-     libc               | []       []       []                  []            | 20
-     libgpewidget       | []    [] []                    []                   | 13
-     libiconv           | [] [] [] []       [] []        []     []            | 27
-     lifelines          |          []                                         |  2
-     lilypond           |          []                                         |  3
-     lingoteach         |                                                     |  2
-     lingoteach_lessons |                                       ()            |  0
-     lynx               |          []       [] []                             | 14
-     m4                 |          []                           []            | 15
-     mailutils          |                                                     |  5
-     make               |          []       []                  []            | 16
-     man-db             |          []                                         |  5
-     minicom            |                                                     | 11
-     mysecretdiary      |          []       []                                | 10
-     nano               |       [] []       [] []                             | 17
-     nano_1_0           |          []       [] []                             | 17
-     opcodes            |          []       []                                |  6
-     parted             |          []       []                  []            | 15
-     ptx                |          []       []                                | 22
-     python             |                                                     |  0
-     radius             |                                                     |  4
-     recode             |    []    []       []                                | 20
-     rpm                |          []       []                                |  9
-     screem             |          []                           []            |  2
-     scrollkeeper       | []    [] []                                         | 15
-     sed                | [] [] [] []       [] []                             | 24
-     sh-utils           |    []             []                                | 14
-     shared-mime-info   |       [] []                                         |  7
-     sharutils          |       [] []       []                        []      | 17
-     silky              | ()                                                  |  3
-     skencil            |          []                                         |  6
-     sketch             |          []                                         |  6
-     soundtracker       | []       []                                         |  7
-     sp                 |                   []                                |  3
-     tar                | [] []    []       []                  []            | 24
-     texinfo            |          []       []                  []            | 14
-     textutils          |    []    []       []                        []      | 16
-     tin                |                                                     |  1
-     tp-robot           |                                                     |  2
-     tuxpaint           | []       []       []           []     []            | 29
-     unicode-han-tra... |                                                     |  0
-     unicode-transla... |                                                     |  2
-     util-linux         |          []       []                                | 15
-     vorbis-tools       |                                                     |  8
-     wastesedge         |                                                     |  0
-     wdiff              | []       []       []                                | 18
-     wget               | [] [] [] []       [] []               []    []      | 24
-     xchat              | [] [] [] []                           []            | 15
-     xfree86_xkb_xml    | []    []          [] []               []            | 11
-     xpad               |                                                     |  5
-                        +-----------------------------------------------------+
-       63 teams           sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
-      131 domains         47 19 28 83  0  0 59 13  1   1 11  0  22    22    0  1373
+                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
+                          52 24  2  2  1  3  0  2  3 21  0 15  1 97  5  1
+
+                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                        +------------------------------------------------------+
+     GNUnet             |                                                      |
+     a2ps               |           ()     []      [] []       []    [] []     |
+     aegis              |                          () ()                       |
+     ant-phone          |                          []                   []     |
+     anubis             |           []             [] []                       |
+     ap-utils           |           ()                                         |
+     aspell             |                          [] []                       |
+     bash               |                  []      [] []                       |
+     batchelor          |                          []                   []     |
+     bfd                |                                                      |
+     bibshelf           |                                               []     |
+     binutils           |                             []                []     |
+     bison              |           []     []      [] []                []     |
+     bison-runtime      |           []             []          []       []     |
+     bluez-pin          |           []     []   [] [] []    [] []    [] []     |
+     cflow              |           []                                         |
+     clisp              |                             []                       |
+     console-tools      |                             []                       |
+     coreutils          |           []                []       []       []     |
+     cpio               |           []                []                []     |
+     cpplib             |                                               []     |
+     cryptonit          |                  []                           []     |
+     darkstat           |           []     []      []       []       [] []     |
+     dialog             |           [] []  []   [] [] [] []          [] []     |
+     diffutils          |           []     []      [] []             [] []     |
+     doodle             |                                         []    []     |
+     e2fsprogs          |           []                                  []     |
+     enscript           |                  []      [] []       []       []     |
+     error              |                  []      []       []          []     |
+     fetchmail          |           []                []          []           |
+     fileutils          |           []             [] []       []       []     |
+     findutils          |           [] []          []       [] []       []     |
+     flex               |           []     []      [] []                []     |
+     fslint             |                  []      []                [] []     |
+     gas                |                                                      |
+     gawk               |           []     []      []                   []     |
+     gbiff              |                          []                          |
+     gcal               |                                               []     |
+     gcc                |                                               []     |
+     gettext-examples   |           [] []          [] []    [] []    [] []     |
+     gettext-runtime    |           [] []          [] []    [] []    [] []     |
+     gettext-tools      |           []             [] []    [] []    [] []     |
+     gimp-print         |                                   []          []     |
+     gip                |                       []          []       [] []     |
+     gliv               |                  []      []       []          []     |
+     glunarclock        |                  []      [] []    []       [] []     |
+     gmult              |                       [] []                [] []     |
+     gnubiff            |                          ()                          |
+     gnucash            |           ()                                  []     |
+     gnucash-glossary   |              []                   []          []     |
+     gnuedu             |                                                      |
+     gnulib             |           []             [] []       []       []     |
+     gnunet-gtk         |                                               []     |
+     gnutls             |           []                                  []     |
+     gpe-aerial         |              []  []      [] []       []    [] []     |
+     gpe-beam           |              []  []      [] []       []    [] []     |
+     gpe-calendar       |                             []                       |
+     gpe-clock          |              []  []      [] []    [] []    [] []     |
+     gpe-conf           |              []  []      [] []    [] []       []     |
+     gpe-contacts       |                          [] []       []    [] []     |
+     gpe-edit           |              []  []      [] []    [] []    [] []     |
+     gpe-filemanager    |                                      []       []     |
+     gpe-go             |                  []      [] []       []    [] []     |
+     gpe-login          |              []  []      [] []    [] []    [] []     |
+     gpe-ownerinfo      |              []  []      [] []    [] []    [] []     |
+     gpe-package        |                                      []       []     |
+     gpe-sketchbook     |              []  []      [] []    [] []    [] []     |
+     gpe-su             |              []  []      [] []    [] []    [] []     |
+     gpe-taskmanager    |              []  []      [] []    [] []    [] []     |
+     gpe-timesheet      |              []  []      [] []    [] []    [] []     |
+     gpe-today          |              []  []      [] []    [] []    [] []     |
+     gpe-todo           |                             []       []    [] []     |
+     gphoto2            |           []             []       []       [] []     |
+     gprof              |                  []      []                   []     |
+     gpsdrive           |        []                []                   []     |
+     gramadoir          |                                   []          []     |
+     grep               |           [] []  []      [] []       []    [] []     |
+     gretl              |           []                                         |
+     gsasl              |           []                               [] []     |
+     gss                |           []             []                   []     |
+     gst-plugins        |     []                                  [] [] []     |
+     gst-plugins-base   |                                               []     |
+     gst-plugins-good   |     []                                  [] [] []     |
+     gstreamer          |                                         [] [] []     |
+     gtick              |                             []                       |
+     gtkam              |           []     []         []                []     |
+     gtkorphan          |                                               []     |
+     gtkspell           |                  []   [] [] []    [] []    [] []     |
+     gutenprint         |                                               []     |
+     hello              |           []     []      [] []    [] []    [] []     |
+     id-utils           |                  []      [] []                []     |
+     impost             |                                               []     |
+     indent             |                  []      [] []    []       [] []     |
+     iso_3166           |              []                []    [] [] [] []     |
+     iso_3166_2         |                                                      |
+     iso_4217           |                                []    []    [] []     |
+     iso_639            |                                []    []    [] []     |
+     jpilot             |                                                      |
+     jtag               |                                   []                 |
+     jwhois             |           []     []      []                   []     |
+     kbd                |           []             []                   []     |
+     keytouch           |                                               []     |
+     keytouch-editor    |                                               []     |
+     keytouch-keyboa... |                                               []     |
+     latrine            |                          []                   []     |
+     ld                 |                                               []     |
+     leafpad            |           [] []             []    []          []  [] |
+     libc               |           []     []         []    []          []     |
+     libexif            |           []                                         |
+     libextractor       |                          []                   []     |
+     libgpewidget       |              []  []      []       [] []    [] []     |
+     libgpg-error       |           []             []                          |
+     libgphoto2         |           []                                         |
+     libgphoto2_port    |           []                []                []     |
+     libgsasl           |           []             []                [] []     |
+     libiconv           |                                      []    []        |
+     libidn             |           []                               [] ()     |
+     lifelines          |           []                                  []     |
+     lilypond           |                                                      |
+     lingoteach         |                  []                                  |
+     lynx               |                  []         []                []     |
+     m4                 |           []     []      [] []                []     |
+     mailutils          |           []             [] []                []     |
+     make               |           []     []         []                []     |
+     man-db             |                          []                   []     |
+     minicom            |           []     []      [] []                []     |
+     mysecretdiary      |                  []      [] []                []     |
+     nano               |                  []      []                   []     |
+     nano_1_0           |           []             [] []                []     |
+     opcodes            |                          []                   []     |
+     parted             |           []                                         |
+     pilot-qof          |                                               []     |
+     psmisc             |           []                                  []     |
+     pwdutils           |           []                                  []     |
+     python             |                                                      |
+     qof                |                  []                           []     |
+     radius             |           []                []                       |
+     recode             |           [] []  []      [] []       []       []     |
+     rpm                |           [] []             []                []     |
+     screem             |                                                      |
+     scrollkeeper       |           []             [] []    []    [] [] []     |
+     sed                |           [] []  []      [] []    [] []    [] []     |
+     sh-utils           |                             []       []    []        |
+     shared-mime-info   |              []  []                     [] [] []     |
+     sharutils          |           []                []             [] []     |
+     shishi             |           []                                         |
+     silky              |                                   []                 |
+     skencil            |              []  []                           []     |
+     sketch             |              []  []                           []     |
+     solfege            |                                               []     |
+     soundtracker       |                                   []          []     |
+     sp                 |                                                      |
+     stardict           |                             []    []          []     |
+     system-tools-ba... |        [] [] []  []      []             [] [] []  [] |
+     tar                |           []             [] []       []       []     |
+     texinfo            |           []             [] []                []     |
+     textutils          |                             []       []       []     |
+     tin                |                             ()                       |
+     tp-robot           |                             []                       |
+     tuxpaint           |              []                      [] [] [] []     |
+     unicode-han-tra... |                                                      |
+     unicode-transla... |                                                      |
+     util-linux         |                  []         []       []       []     |
+     vorbis-tools       |                          [] []                       |
+     wastesedge         |                                                      |
+     wdiff              |           []     []      [] []    []          []     |
+     wget               |              []             []    []          []     |
+     xchat              |        []                   []    [] [] [] [] []     |
+     xkeyboard-config   |                                      []       []     |
+     xpad               |                                   [] []       []     |
+                        +------------------------------------------------------+
+                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                           0   2  3 58 30  54    5 73 72  4 40 46 11 50 128  2
+
+                          tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+                        +---------------------------------------------------+
+     GNUnet             |                    []                             |  2
+     a2ps               |          [] []     []                             | 19
+     aegis              |                                                   |  0
+     ant-phone          |          []        []                             |  6
+     anubis             |          [] []     []                             | 11
+     ap-utils           |             ()     []                             |  4
+     aspell             |             []     []  []                         | 15
+     bash               |                    []                             | 11
+     batchelor          |          []        []                             |  9
+     bfd                |                                                   |  1
+     bibshelf           |                    []                             |  7
+     binutils           |          []        []                     []      |  9
+     bison              |          []        []                     []      | 19
+     bison-runtime      |                    []         []          []      | 15
+     bluez-pin          |          [] []     []  []     []          []      | 28
+     cflow              |             []     []                             |  5
+     clisp              |                                                   |  6
+     console-tools      |          []        []                             |  5
+     coreutils          |          []        []                             | 16
+     cpio               |          [] []     []                             |  9
+     cpplib             |          []        []         []          []      | 11
+     cryptonit          |                                                   |  5
+     darkstat           |                    []         ()          ()      | 15
+     dialog             |          [] []     []         []          []      | 30
+     diffutils          |          []        []         []          []      | 28
+     doodle             |                    []                             |  6
+     e2fsprogs          |          []        []                             | 10
+     enscript           |          [] []     []                             | 16
+     error              |          []        []         []          []      | 18
+     fetchmail          |          []        []                             | 12
+     fileutils          |          []                   []          []      | 18
+     findutils          |          []        []                     []      | 17
+     flex               |          []        []                             | 15
+     fslint             |                    []                             |  9
+     gas                |          []                                       |  3
+     gawk               |          []        []                             | 15
+     gbiff              |                    []                             |  5
+     gcal               |          []                                       |  5
+     gcc                |          []                   []          []      |  6
+     gettext-examples   |          [] []     []         []    []    []      | 27
+     gettext-runtime    |          [] []     []         []    []    []      | 28
+     gettext-tools      |          [] []     []         []          []      | 19
+     gimp-print         |             []     []                             | 12
+     gip                |                    []                     []      | 12
+     gliv               |          []        []                             |  8
+     glunarclock        |                    []  []                 []      | 15
+     gmult              |          []        []         []          []      | 15
+     gnubiff            |                    []                             |  1
+     gnucash            |          ()                                       |  2
+     gnucash-glossary   |                    []                     []      |  9
+     gnuedu             |                    []                             |  2
+     gnulib             |          [] []     []         []          []      | 28
+     gnunet-gtk         |                                                   |  1
+     gnutls             |                                                   |  2
+     gpe-aerial         |                    []         []                  | 14
+     gpe-beam           |                    []         []                  | 14
+     gpe-calendar       |                    []                             |  3
+     gpe-clock          |          []        []  []     []                  | 21
+     gpe-conf           |                    []         []                  | 14
+     gpe-contacts       |                    []         []                  | 10
+     gpe-edit           |          []        []  []                 []      | 20
+     gpe-filemanager    |                    []                             |  6
+     gpe-go             |          []        []                             | 15
+     gpe-login          |          []        []  []     []          []      | 21
+     gpe-ownerinfo      |          []        []         []          []      | 21
+     gpe-package        |                    []                             |  6
+     gpe-sketchbook     |          []        []                             | 16
+     gpe-su             |          []        []         []                  | 20
+     gpe-taskmanager    |          []        []         []                  | 20
+     gpe-timesheet      |          []        []         []          []      | 18
+     gpe-today          |          []        []  []     []          []      | 21
+     gpe-todo           |                    []                             |  7
+     gphoto2            |             []     []         []          []      | 20
+     gprof              |          []        []                             | 11
+     gpsdrive           |                                                   |  4
+     gramadoir          |                    []                             |  7
+     grep               |          [] []     []                     []      | 34
+     gretl              |                                                   |  4
+     gsasl              |                    []         []                  |  8
+     gss                |                    []                             |  5
+     gst-plugins        |             []     []                     []      | 15
+     gst-plugins-base   |             []     []         []                  |  9
+     gst-plugins-good   |             []     []         []    []    []      | 20
+     gstreamer          |          [] []     []                             | 17
+     gtick              |                    []                             |  3
+     gtkam              |                    []                             | 13
+     gtkorphan          |                    []                             |  7
+     gtkspell           |             []     []  []     []    []    []      | 26
+     gutenprint         |                                                   |  3
+     hello              |          [] []     []         []          []      | 37
+     id-utils           |          []        []                             | 14
+     impost             |                    []                             |  4
+     indent             |          []        []         []          []      | 25
+     iso_3166           |       [] []        []               []            | 16
+     iso_3166_2         |                                                   |  2
+     iso_4217           |          []        []                             | 14
+     iso_639            |                    []                             | 14
+     jpilot             |          [] []     []         []                  |  7
+     jtag               |                    []                             |  3
+     jwhois             |          []        []                     []      | 13
+     kbd                |          []        []                             | 12
+     keytouch           |                    []                             |  4
+     keytouch-editor    |                                                   |  2
+     keytouch-keyboa... |                    []                             |  3
+     latrine            |          []        []                             |  8
+     ld                 |          []        []         []          []      |  8
+     leafpad            |          []        []         []          []      | 23
+     libc               |          []                   []          []      | 23
+     libexif            |                    []                             |  4
+     libextractor       |                    []                             |  5
+     libgpewidget       |                    []  []     []                  | 19
+     libgpg-error       |                    []                             |  4
+     libgphoto2         |             []                                    |  8
+     libgphoto2_port    |             []     []                     []      | 11
+     libgsasl           |                    []                             |  8
+     libiconv           |                    []                             |  7
+     libidn             |                    []         []                  | 10
+     lifelines          |                                                   |  4
+     lilypond           |                                                   |  2
+     lingoteach         |                    []                             |  6
+     lynx               |          [] []     []                             | 15
+     m4                 |                    []         []          []      | 18
+     mailutils          |             []                                    |  8
+     make               |          []        []         []                  | 20
+     man-db             |                    []                             |  6
+     minicom            |                    []                             | 14
+     mysecretdiary      |          []        []                             | 12
+     nano               |                    []                     []      | 17
+     nano_1_0           |          [] []     []                             | 18
+     opcodes            |          []        []                             | 10
+     parted             |          [] []                            []      | 10
+     pilot-qof          |                    []                             |  3
+     psmisc             |                    []                             | 10
+     pwdutils           |                    []                             |  3
+     python             |                                                   |  0
+     qof                |                    []                             |  4
+     radius             |             []                                    |  6
+     recode             |          []        []         []                  | 25
+     rpm                |          [] []     []                     []      | 14
+     screem             |                    []                             |  2
+     scrollkeeper       |          [] []     []                     []      | 26
+     sed                |          []        []                     []      | 22
+     sh-utils           |          []                                       | 15
+     shared-mime-info   |             []     []         []          []      | 24
+     sharutils          |          []        []                     []      | 23
+     shishi             |                                                   |  1
+     silky              |                    []                             |  4
+     skencil            |                    []                             |  7
+     sketch             |                                                   |  6
+     solfege            |                                                   |  2
+     soundtracker       |          []        []                             |  9
+     sp                 |          []                                       |  3
+     stardict           |             []     []         []          []      | 11
+     system-tools-ba... |    []    [] []     []     []  []          []      | 37
+     tar                |          [] []     []                     []      | 20
+     texinfo            |          []        []         []                  | 15
+     textutils          |          []                   []          []      | 17
+     tin                |                                                   |  1
+     tp-robot           |                    []         []          []      | 10
+     tuxpaint           |                    []  []                 []      | 16
+     unicode-han-tra... |                                                   |  0
+     unicode-transla... |                                                   |  2
+     util-linux         |          [] []     []                             | 20
+     vorbis-tools       |             []     []                             | 11
+     wastesedge         |                                                   |  1
+     wdiff              |          []        []                             | 22
+     wget               |          []        []                     []      | 19
+     xchat              |             []     []         []          []      | 29
+     xkeyboard-config   |          [] []     []                     []      | 11
+     xpad               |                    []         []          []      | 14
+                        +---------------------------------------------------+
+       77 teams           tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+      170 domains          0  1  1 77 39  0  136 10  1  48     5    54    0  2028
 
    Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
@@ -743,13 +1075,13 @@ distributed as such by its maintainer.  There might be an observable
 lag between the mere existence a PO file and its wide availability in a
 distribution.
 
-   If January 2004 seems to be old, you may fetch a more recent copy of
+   If October 2006 seems to be old, you may fetch a more recent copy of
 this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
 matrix with full percentage details can be found at
 `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
 
-Using `gettext' in new packages
-===============================
+1.6 Using `gettext' in new packages
+===================================
 
 If you are writing a freely available program and want to
 internationalize it you are welcome to use GNU `gettext' in your
diff --git a/COPYING b/COPYING
index 3912109b5..443254047 100644
--- a/COPYING
+++ b/COPYING
@@ -1,284 +1,626 @@
+
 		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+		       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
 			    Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+
+		       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+ 
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+  
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -287,15 +629,15 @@ free software which everyone can redistribute and change under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -304,37 +646,31 @@ the "copyright" line and a pointer to where the full notice is found.
     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 St, Fifth Floor, Boston, MA  02110-1301  USA
-
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
 
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
 
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/ChangeLog b/ChangeLog
index 7d9b58f70..39c7a5ed2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-10-23  Werner Koch  <[email protected]>
+
+	Switched entire package to GPLv3+.
+
+	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Enable Camellia and mailto.
+
+	* configure.ac (MPI_OPT_FLAGS): Always use AM_PO_SUBDIRS.
+
+2007-10-23  gettextize  <[email protected]>
+
+	* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.16.1.
+
 2007-10-17  David Shaw  <[email protected]>
 
 	* configure.ac: Change various help messages to use
diff --git a/Makefile.am b/Makefile.am
index 3423e70ff..00f2fa0f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@
 #
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -13,13 +13,12 @@
 # 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
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 ## Process this file with automake to produce Makefile.in
 
 ACLOCAL_AMFLAGS = -I m4
-DISTCHECK_CONFIGURE_FLAGS = --enable-selinux-support
+DISTCHECK_CONFIGURE_FLAGS = --enable-selinux-support \
+                            --enable-camellia --enable-mailto
 AUTOMAKE_OPTIONS = dist-bzip2 filename-length-max=99
 
 if CROSS_COMPILING
diff --git a/NEWS b/NEWS
index 31c3b12bf..c39dc5332 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ Noteworthy changes in version 1.4.8 (unreleased)
 
     * Minor bug fixes.
 
+
 Noteworthy changes in version 1.4.7 (2007-03-05)
 ------------------------------------------------
 
diff --git a/README b/README
index 0e20a37fc..c5cc7cace 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
 
 		    GnuPG - The GNU Privacy Guard
 		   -------------------------------
-			    Version 1.4.6
+			    Version 1.4.8
 
 	 Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-		 2005, 2006 Free Software Foundation, Inc.
+           2005, 2006, 2007 Free Software Foundation, Inc.
 
     This file is free software; as a special exception the author
     gives unlimited permission to copy and/or distribute it, with or
@@ -97,7 +97,7 @@
        make sure that this is really the key and not a faked one. You
        can do this by comparing the output of:
 
-		$ gpg --fingerprint 0x1CE0C630
+        $ gpg --fingerprint 0x1CE0C630
 
        with the fingerprint published elsewhere.
 
diff --git a/acinclude.m4 b/acinclude.m4
index 149a48506..e9b1b16b2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,21 +1,21 @@
-dnl macros to configure gnupg
-dnl Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
-dnl
-dnl This file is part of GnuPG.
-dnl
-dnl GnuPG is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl 
-dnl GnuPG is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+# macros to configure gnupg
+# Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# GnuPG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
 
 dnl GNUPG_MSG_PRINT(STRING)
 dnl print a message
diff --git a/checks/Makefile.am b/checks/Makefile.am
index d5218f736..70ae58b0b 100644
--- a/checks/Makefile.am
+++ b/checks/Makefile.am
@@ -4,7 +4,7 @@
 #
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
 # 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
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 # Process this file with automake to create Makefile.in
 
 GPG_IMPORT  = ../g10/gpg --homedir . --quiet --yes --no-permission-warning --import
diff --git a/checks/multisig.test b/checks/multisig.test
index ece6f22da..ee194aef9 100755
--- a/checks/multisig.test
+++ b/checks/multisig.test
@@ -142,4 +142,4 @@ for i in sig_1ls1ls_valid sig_ls_valid \
 done
 
 
-resume_error
\ No newline at end of file
+resume_error
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index 5bf0f805e..f694ef07c 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-23  Werner Koch  <[email protected]>
+
+	Switched entire package to GPLv3+.
+
 2007-07-09  Werner Koch  <[email protected]>
 
 	* camellia.c, camellia.h: Fixed the FSF's postal address.
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
index 558d88047..a10af20ce 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -5,7 +5,7 @@
 #
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
 # 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
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
diff --git a/cipher/algorithms.h b/cipher/algorithms.h
index 9ef81645b..5c972f291 100644
--- a/cipher/algorithms.h
+++ b/cipher/algorithms.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GNUPG_ALGORITHMS_H
 #define GNUPG_ALGORITHMS_H 1
diff --git a/cipher/bithelp.h b/cipher/bithelp.h
index 64209bacd..3ce375ee0 100644
--- a/cipher/bithelp.h
+++ b/cipher/bithelp.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_BITHELP_H
 #define G10_BITHELP_H
diff --git a/cipher/blowfish.c b/cipher/blowfish.c
index 1a1ce5678..61cd2b743 100644
--- a/cipher/blowfish.c
+++ b/cipher/blowfish.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * For a description of the algorithm, see:
  *   Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996.
diff --git a/cipher/camellia-glue.c b/cipher/camellia-glue.c
index 169f686b7..2a6f553c1 100644
--- a/cipher/camellia-glue.c
+++ b/cipher/camellia-glue.c
@@ -5,7 +5,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* I put the GnuPG-specific stuff in this file to keep the
diff --git a/cipher/camellia.c b/cipher/camellia.c
index 3e45f5d50..1a204e13b 100644
--- a/cipher/camellia.c
+++ b/cipher/camellia.c
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/cipher/camellia.h b/cipher/camellia.h
index 9af323665..f9744030d 100644
--- a/cipher/camellia.h
+++ b/cipher/camellia.h
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef HEADER_CAMELLIA_H
diff --git a/cipher/cast5.c b/cipher/cast5.c
index 043aa7aed..ed8c738d1 100644
--- a/cipher/cast5.c
+++ b/cipher/cast5.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Test vectors:
diff --git a/cipher/cipher.c b/cipher/cipher.c
index b50e9a337..c8ebb7574 100644
--- a/cipher/cipher.c
+++ b/cipher/cipher.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/cipher/des.c b/cipher/des.c
index 6ad799395..756c1461c 100644
--- a/cipher/des.c
+++ b/cipher/des.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *
  * According to the definition of DES in FIPS PUB 46-2 from December 1993.
diff --git a/cipher/dsa.c b/cipher/dsa.c
index e32d90564..69b7d1bff 100644
--- a/cipher/dsa.c
+++ b/cipher/dsa.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/cipher/dsa.h b/cipher/dsa.h
index 6902b548c..6dc96ce03 100644
--- a/cipher/dsa.h
+++ b/cipher/dsa.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_DSA_H
diff --git a/cipher/dynload.c b/cipher/dynload.c
index 05d82f623..43a428780 100644
--- a/cipher/dynload.c
+++ b/cipher/dynload.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/cipher/elgamal.c b/cipher/elgamal.c
index eb701164d..c3f086238 100644
--- a/cipher/elgamal.c
+++ b/cipher/elgamal.c
@@ -10,7 +10,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -19,9 +19,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/cipher/elgamal.h b/cipher/elgamal.h
index 416f49cc5..24bfc8c7b 100644
--- a/cipher/elgamal.h
+++ b/cipher/elgamal.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_ELGAMAL_H
diff --git a/cipher/gost.c b/cipher/gost.c
index 1b6be38c5..122e1906c 100644
--- a/cipher/gost.c
+++ b/cipher/gost.c
@@ -9,7 +9,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -18,9 +18,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/cipher/gost.h b/cipher/gost.h
index bbe8bc522..6fbfe5297 100644
--- a/cipher/gost.h
+++ b/cipher/gost.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_GOST_H
 #define G10_GOST_H
diff --git a/cipher/idea-stub.c b/cipher/idea-stub.c
index 55b5cb506..5c2bd11a0 100644
--- a/cipher/idea-stub.c
+++ b/cipher/idea-stub.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* IDEA is a patented algorithm and therefore the use of IDEA in
diff --git a/cipher/md.c b/cipher/md.c
index 8faf20831..9ee0fa7e5 100644
--- a/cipher/md.c
+++ b/cipher/md.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/cipher/md5.c b/cipher/md5.c
index 270e3fe3e..db608956a 100644
--- a/cipher/md5.c
+++ b/cipher/md5.c
@@ -4,7 +4,7 @@
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
+ * Free Software Foundation; either version 3, or (at your option) any
  * later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * According to the definition of MD5 in RFC 1321 from April 1992.
  * NOTE: This is *not* the same file as the one from glibc.
diff --git a/cipher/primegen.c b/cipher/primegen.c
index 7eccea674..73b39732a 100644
--- a/cipher/primegen.c
+++ b/cipher/primegen.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * ***********************************************************************
  * The algorithm used to generate practically save primes is due to
diff --git a/cipher/pubkey.c b/cipher/pubkey.c
index d6d1ff1f2..06642445a 100644
--- a/cipher/pubkey.c
+++ b/cipher/pubkey.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/cipher/rand-internal.h b/cipher/rand-internal.h
index cb398877a..c1d7db960 100644
--- a/cipher/rand-internal.h
+++ b/cipher/rand-internal.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_RAND_INTERNAL_H
 #define G10_RAND_INTERNAL_H
diff --git a/cipher/random.c b/cipher/random.c
index 6bc8e5671..c23f9ea33 100644
--- a/cipher/random.c
+++ b/cipher/random.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/cipher/random.h b/cipher/random.h
index 0f26d999b..ca02df1a5 100644
--- a/cipher/random.h
+++ b/cipher/random.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_RANDOM_H
 #define G10_RANDOM_H
diff --git a/cipher/rijndael.c b/cipher/rijndael.c
index e52e01e96..644b75c42 100644
--- a/cipher/rijndael.c
+++ b/cipher/rijndael.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *******************************************************************
  * The code here is based on the optimized implementation taken from
  * http://www.esat.kuleuven.ac.be/~rijmen/rijndael/ on Oct 2, 2000,
diff --git a/cipher/rmd.h b/cipher/rmd.h
index 1313bb78b..fbcc1c8af 100644
--- a/cipher/rmd.h
+++ b/cipher/rmd.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_RMD_H
 #define G10_RMD_H
diff --git a/cipher/rmd160.c b/cipher/rmd160.c
index 7a7230f38..4af3fe9d7 100644
--- a/cipher/rmd160.c
+++ b/cipher/rmd160.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/cipher/rmd160test.c b/cipher/rmd160test.c
index 94912269b..4de14a8fc 100644
--- a/cipher/rmd160test.c
+++ b/cipher/rmd160test.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/cipher/rndegd.c b/cipher/rndegd.c
index e6646a243..22cb69bcd 100644
--- a/cipher/rndegd.c
+++ b/cipher/rndegd.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/cipher/rndlinux.c b/cipher/rndlinux.c
index c6f646c63..fd4fd8e0f 100644
--- a/cipher/rndlinux.c
+++ b/cipher/rndlinux.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/cipher/rndriscos.c b/cipher/rndriscos.c
index 5565e1fee..966457c4e 100644
--- a/cipher/rndriscos.c
+++ b/cipher/rndriscos.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/cipher/rndw32.c b/cipher/rndw32.c
index f81f1c191..7a81860c3 100644
--- a/cipher/rndw32.c
+++ b/cipher/rndw32.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *************************************************************************
  * The code here is based on code from Cryptlib 3.0 beta by Peter Gutmann.
diff --git a/cipher/rsa.c b/cipher/rsa.c
index b6d7603da..1cdc6002b 100644
--- a/cipher/rsa.c
+++ b/cipher/rsa.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This code uses an algorithm protected by U.S. Patent #4,405,829
diff --git a/cipher/rsa.h b/cipher/rsa.h
index e6ea42356..54b83ca35 100644
--- a/cipher/rsa.h
+++ b/cipher/rsa.h
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_RSA_H
diff --git a/cipher/sha1.c b/cipher/sha1.c
index d150fad1e..309b38691 100644
--- a/cipher/sha1.c
+++ b/cipher/sha1.c
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/cipher/sha256.c b/cipher/sha256.c
index 240307356..b4930c002 100644
--- a/cipher/sha256.c
+++ b/cipher/sha256.c
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/cipher/sha512.c b/cipher/sha512.c
index 523579d25..87ce90e9d 100644
--- a/cipher/sha512.c
+++ b/cipher/sha512.c
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/cipher/smallprime.c b/cipher/smallprime.c
index b110fbbd1..88d903fa9 100644
--- a/cipher/smallprime.c
+++ b/cipher/smallprime.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/configure.ac b/configure.ac
index debc9659b..b5f730694 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,25 +1,23 @@
-dnl configure.ac script for GnuPG
-dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-dnl               2007 Free Software Foundation, Inc.
-dnl
-dnl This file is part of GnuPG.
-dnl
-dnl GnuPG is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl 
-dnl GnuPG is distributed in the hope that it will be useful,g
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-dnl MA 02110-1301, USA
-dnl
-dnl (Process this file with autoconf to produce a configure script.)
+# configure.ac script for GnuPG
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+#               2007 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+# 
+# GnuPG is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# GnuPG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# (Process this file with autoconf to produce a configure script.)
 
 AC_PREREQ(2.59)
 min_automake_version="1.9.3"
@@ -833,24 +831,26 @@ AC_SUBST(MPI_OPT_FLAGS)
 
 dnl Checks for libraries.
 
+AM_PO_SUBDIRS
+AM_GNU_GETTEXT_VERSION([0.16.1])
 if test "$try_gettext" = yes; then
+  AM_GNU_GETTEXT(,[need-ngettext])
   # gettext requires some extra checks.  These really should be part of
   # the basic AM_GNU_GETTEXT macro.  TODO: move other gettext-specific
   # function checks to here.
-
   AC_CHECK_FUNCS(strchr)
 else
   enable_nls=no
+  USE_NLS=no
   USE_INCLUDED_LIBINTL=no
   BUILD_INCLUDED_LIBINTL=no
+  POSUB=po
   AC_SUBST(USE_NLS)
   AC_SUBST(USE_INCLUDED_LIBINTL)
   AC_SUBST(BUILD_INCLUDED_LIBINTL)
-  AM_PO_SUBDIRS
+  AC_SUBST(POSUB)
 fi
 
-AM_GNU_GETTEXT_VERSION(0.14.1)
-AM_GNU_GETTEXT(,[need-ngettext])
 
 if test "$try_extensions" = yes || test x"$card_support" = xyes ; then
   if test "$need_dlopen" = yes; then
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 2807b4ee7..2921ee535 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-23  Werner Koch  <[email protected]>
+
+	* gpg.texi: Updated from gnupg-2.
+
+	* gpl.texi: Replace by GPLv3 version.
+	
+	* Makefile.am: Use standard suffix rules.
+
 2006-12-04  Werner Koch  <[email protected]>
 
 	* yat2m.c: New.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 30d39a2d0..333f19f85 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,7 +4,7 @@
 #
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
 # 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
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 ## Process this file with automake to create Makefile.in
 
 EXTRA_DIST = DETAILS faq.raw FAQ faq.html \
@@ -77,7 +75,7 @@ $(myman_pages) : yat2m-stamp
              fi
 
 
-%.1 : %.sgml
+.sgml.1:
 if HAVE_DOCBOOK_TO_MAN
 	docbook-to-man $<  >$@
 else
diff --git a/doc/README.W32 b/doc/README.W32
index cd30711f7..b734cb32b 100644
--- a/doc/README.W32
+++ b/doc/README.W32
@@ -123,11 +123,11 @@ Copying:
 GnuPG is
 
   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 
-            2005 Free Software Foundation, Inc.
+            2005, 2006, 2007 Free Software Foundation, Inc.
 
   GnuPG is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  the Free Software Foundation; either version 3 of the License, or
   (at your option) any later version.
 
   GnuPG is distributed in the hope that it will be useful, but WITHOUT
@@ -136,9 +136,8 @@ GnuPG is
   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
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+
 
 See the files AUTHORS and THANKS for credits, further legal
 information and bug reporting addresses pertaining to GnuPG.
diff --git a/doc/faq.raw b/doc/faq.raw
index cbab76b0c..27018c599 100644
--- a/doc/faq.raw
+++ b/doc/faq.raw
@@ -1338,7 +1338,5 @@ you could search in the mailing list archive.
 [H hr]
 
 Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02111, USA
-
 Verbatim copying and distribution of this entire article is permitted in
 any medium, provided this notice is preserved.
diff --git a/doc/gnupg1.texi b/doc/gnupg1.texi
index 75c98ba1b..5a219b37b 100644
--- a/doc/gnupg1.texi
+++ b/doc/gnupg1.texi
@@ -39,7 +39,7 @@ Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Free Softw
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 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
+Free Software Foundation; either version 3 of the License, or (at your
 option) any later version. The text of the license can be found in the
 section entitled ``Copying''.
 @end quotation
diff --git a/doc/gpg.ru.sgml b/doc/gpg.ru.sgml
index 5c7be9c78..f84cd9145 100644
--- a/doc/gpg.ru.sgml
+++ b/doc/gpg.ru.sgml
@@ -8,7 +8,7 @@
 
     GnuPG is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
 
     GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
     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
+    along with this file; if not, see <http://www.gnu.org/licenses/>.
 -->
 <!-- This file should be processed by docbook-to-man to
      create a manual page.  This program has currently the bug
diff --git a/doc/gpg.texi b/doc/gpg.texi
index e70c32341..409320a7c 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1,5 +1,5 @@
-@c Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-@c               2006 Free Software Foundation, Inc.
+@c Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+@c               2007 Free Software Foundation, Inc.
 @c This is part of the GnuPG manual.
 @c For copying conditions, see the file gnupg.texi.
 
@@ -309,6 +309,14 @@ command "tsign").
 @opindex check-sigs
 Same as @option{--list-sigs}, but the signatures are verified.
 
+The status of the verification is indicated by a flag directly following
+the "sig" tag (and thus before the flags described above for
+@option{--list-sigs}).  A "!" indicates that the signature has been
+successfully verified, a "-" denotes a bad signature and a "%" is used
+if an error occured while checking the signature (e.g. a non supported
+algorithm).
+
+
 @item --fingerprint
 @opindex fingerprint
 List all keys (or the specified ones) along with their
@@ -908,6 +916,28 @@ Reset verbose level to 0.
 @opindex quiet
 Try to be as quiet as possible.
 
+@item --batch
+@itemx --no-batch
+@opindex batch
+@opindex no-batch
+Use batch mode.  Never ask, do not allow interactive commands.
+@option{--no-batch} disables this option.
+
+@item --no-tty
+@opindex no-tty
+Make sure that the TTY (terminal) is never used for any output.
+This option is needed in some cases because GnuPG sometimes prints
+warnings to the TTY even if @option{--batch} is used.
+
+@item --yes
+@opindex yes
+Assume "yes" on most questions.
+
+@item --no
+@opindex no
+Assume "no" on most questions.
+
+
 @item --list-options @code{parameters}
 @opindex list-options
 This is a space or comma delimited string that gives options used when
@@ -1844,31 +1874,31 @@ using this option, the encrypted message becomes vulnerable to a
 message modification attack.
 
 @item --personal-cipher-preferences @code{string}
-Set the list of personal cipher preferences to @code{string}, this list
-should be a string similar to the one printed by the command "pref" in
-the edit menu. This allows the user to factor in their own preferred
-algorithms when algorithms are chosen via recipient key preferences.
-The most highly ranked cipher in this list is also used for the
-@option{--symmetric} encryption command.
+Set the list of personal cipher preferences to @code{string}.  Use
+@command{@gpgname --version} to get a list of available algorithms,
+and use @code{none} to set no preference at all.  This allows the user
+to factor in their own preferred algorithms when algorithms are chosen
+via recipient key preferences.  The most highly ranked cipher in this
+list is also used for the @option{--symmetric} encryption command.
 
 @item --personal-digest-preferences @code{string}
-Set the list of personal digest preferences to @code{string}, this list
-should be a string similar to the one printed by the command "pref" in
-the edit menu. This allows the user to factor in their own preferred
-algorithms when algorithms are chosen via recipient key preferences.
-The most highly ranked digest algorithm in this list is algo used when
-signing without encryption (e.g. @option{--clearsign} or
-@option{--sign}). The default value is SHA-1.
+Set the list of personal digest preferences to @code{string}.  Use
+@command{@gpgname --version} to get a list of available algorithms,
+and use @code{none} to set no preference at all.  This allows the user
+to factor in their own preferred algorithms when algorithms are chosen
+via recipient key preferences.  The most highly ranked digest
+algorithm in this list is algo used when signing without encryption
+(e.g. @option{--clearsign} or @option{--sign}). The default value is
+SHA-1.
 
 @item --personal-compress-preferences @code{string}
-Set the list of personal compression preferences to @code{string}, this
-list should be a string similar to the one printed by the command
-"pref" in the edit menu. This allows the user to factor in their own
-preferred algorithms when algorithms are chosen via recipient key
-preferences. The most highly ranked algorithm in this list is also
-used when there are no recipient keys to consider (e.g. @option{--symmetric}).
-
-
+Set the list of personal compression preferences to @code{string}.
+Use @command{@gpgname --version} to get a list of available
+algorithms, and use @code{none} to set no preference at all.  This
+allows the user to factor in their own preferred algorithms when
+algorithms are chosen via recipient key preferences.  The most highly
+ranked compression algorithm in this list is algo used when there are
+no recipient keys to consider (e.g. @option{--symmetric}).
 
 @item --s2k-cipher-algo @code{name}
 Use @code{name} as the cipher algorithm used to protect secret keys.
diff --git a/doc/gpl.texi b/doc/gpl.texi
index 00108d230..7f9a48a13 100644
--- a/doc/gpl.texi
+++ b/doc/gpl.texi
@@ -1,321 +1,663 @@
 @node Copying
-@appendix GNU GENERAL PUBLIC LICENSE
 
-@cindex GPL, GNU General Public License
-@center Version 2, June 1991
+@unnumbered GNU General Public License
+@center Version 3, 29 June 2007
+
+@c This file is intended to be included in another file.
 
 @display
-Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/}
 
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
 @end display
 
-@appendixsubsec Preamble
+@unnumberedsec Preamble
+
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software---to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom
+to share and change all versions of a program--to make sure it remains
+free software for all its users.  We, the Free Software Foundation,
+use the GNU General Public License for most of our software; it
+applies also to any other work released this way by its authors.  You
+can apply it to your programs, too.
 
-  When we speak of free software, we are referring to freedom, not
+When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you
+have certain responsibilities if you distribute copies of the
+software, or if you modify it: responsibilities to respect the freedom
+of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too,
+receive or can get the source code.  And you must show them these
+terms so they know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so.  This is fundamentally incompatible with the
+aim of protecting users' freedom to change the software.  The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products.  If such problems arise substantially in
+other domains, we stand ready to extend this provision to those
+domains in future versions of the GPL, as needed to protect the
+freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish
+to avoid the special danger that patents applied to a free program
+could make it effectively proprietary.  To prevent this, the GPL
+assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
 modification follow.
 
 @iftex
-@appendixsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+@unnumberedsec TERMS AND CONDITIONS
 @end iftex
 @ifinfo
-@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+@center TERMS AND CONDITIONS
 @end ifinfo
 
-@enumerate
-@item
-This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The ``Program'', below,
-refers to any such program or work, and a ``work based on the Program''
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term ``modification''.)  Each licensee is addressed as ``you''.
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-@item
-You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-@item
-You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+@enumerate 0
+@item Definitions.
+
+``This License'' refers to version 3 of the GNU General Public License.
+
+``Copyright'' also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+``The Program'' refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as ``you''.  ``Licensees'' and
+``recipients'' may be individuals or organizations.
+
+To ``modify'' a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy.  The resulting work is called a ``modified version'' of
+the earlier work or a work ``based on'' the earlier work.
+
+A ``covered work'' means either the unmodified Program or a work based
+on the Program.
+
+To ``propagate'' a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To ``convey'' a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays ``Appropriate Legal Notices'' to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+@item Source Code.
+
+The ``source code'' for a work means the preferred form of the work for
+making modifications to it.  ``Object code'' means any non-source form
+of a work.
+
+A ``Standard Interface'' means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The ``System Libraries'' of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+``Major Component'', in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The ``Corresponding Source'' for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+@item Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright.  Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+@item Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+@item Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+@item Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
 
 @enumerate a
+@item 
+The work must carry prominent notices stating that you modified it,
+and giving a relevant date.
+
 @item
-You must cause the modified files to carry prominent notices
-stating that you changed the files and the date of any change.
+The work must carry prominent notices stating that it is released
+under this License and any conditions added under section 7.  This
+requirement modifies the requirement in section 4 to ``keep intact all
+notices''.
 
 @item
-You must cause any work that you distribute or publish, that in
-whole or in part contains or is derived from the Program or any
-part thereof, to be licensed as a whole at no charge to all third
-parties under the terms of this License.
+You must license the entire work, as a whole, under this License to
+anyone who comes into possession of a copy.  This License will
+therefore apply, along with any applicable section 7 additional terms,
+to the whole of the work, and all its parts, regardless of how they
+are packaged.  This License gives no permission to license the work in
+any other way, but it does not invalidate such permission if you have
+separately received it.
 
 @item
-If the modified program normally reads commands interactively
-when run, you must cause it, when started running for such
-interactive use in the most ordinary way, to print or display an
-announcement including an appropriate copyright notice and a
-notice that there is no warranty (or else, saying that you provide
-a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this
-License.  (Exception: if the Program itself is interactive but
-does not normally print such an announcement, your work based on
-the Program is not required to print an announcement.)
+If the work has interactive user interfaces, each must display
+Appropriate Legal Notices; however, if the Program has interactive
+interfaces that do not display Appropriate Legal Notices, your work
+need not make them do so.
 @end enumerate
 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+``aggregate'' if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
 
-@item
-You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+@item  Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
 
 @enumerate a
 @item
-Accompany it with the complete corresponding machine-readable
-source code, which must be distributed under the terms of Sections
-1 and 2 above on a medium customarily used for software interchange; or,
+Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by the
+Corresponding Source fixed on a durable physical medium customarily
+used for software interchange.
 
 @item
-Accompany it with a written offer, valid for at least three
-years, to give any third party, for a charge no more than your
-cost of physically performing source distribution, a complete
-machine-readable copy of the corresponding source code, to be
-distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
+Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by a written
+offer, valid for at least three years and valid for as long as you
+offer spare parts or customer support for that product model, to give
+anyone who possesses the object code either (1) a copy of the
+Corresponding Source for all the software in the product that is
+covered by this License, on a durable physical medium customarily used
+for software interchange, for a price no more than your reasonable
+cost of physically performing this conveying of source, or (2) access
+to copy the Corresponding Source from a network server at no charge.
 
 @item
-Accompany it with the information you received as to the offer
-to distribute corresponding source code.  (This alternative is
-allowed only for noncommercial distribution and only if you
-received the program in object code or executable form with such
-an offer, in accord with Subsection b above.)
+Convey individual copies of the object code with a copy of the written
+offer to provide the Corresponding Source.  This alternative is
+allowed only occasionally and noncommercially, and only if you
+received the object code with such an offer, in accord with subsection
+6b.
+
+@item
+Convey the object code by offering access from a designated place
+(gratis or for a charge), and offer equivalent access to the
+Corresponding Source in the same way through the same place at no
+further charge.  You need not require recipients to copy the
+Corresponding Source along with the object code.  If the place to copy
+the object code is a network server, the Corresponding Source may be
+on a different server (operated by you or a third party) that supports
+equivalent copying facilities, provided you maintain clear directions
+next to the object code saying where to find the Corresponding Source.
+Regardless of what server hosts the Corresponding Source, you remain
+obligated to ensure that it is available for as long as needed to
+satisfy these requirements.
+
+@item
+Convey the object code using peer-to-peer transmission, provided you
+inform other peers where the object code and Corresponding Source of
+the work are being offered to the general public at no charge under
+subsection 6d.
+
 @end enumerate
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A ``User Product'' is either (1) a ``consumer product'', which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling.  In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage.  For a particular product received by a particular user,
+``normally used'' refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product.  A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+``Installation Information'' for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source.  The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed.  Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+@item Additional Terms.
+
+``Additional permissions'' are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
 
+@enumerate a
 @item
-You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+Disclaiming warranty or limiting liability differently from the terms
+of sections 15 and 16 of this License; or
 
 @item
-You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+Requiring preservation of specified reasonable legal notices or author
+attributions in that material or in the Appropriate Legal Notices
+displayed by works containing it; or
 
 @item
-Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
+Prohibiting misrepresentation of the origin of that material, or
+requiring that modified versions of such material be marked in
+reasonable ways as different from the original version; or
 
 @item
-If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+Limiting the use for publicity purposes of names of licensors or
+authors of the material; or
 
 @item
-If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
+Declining to grant rights under trademark law for use of some trade
+names, trademarks, or service marks; or
 
 @item
-The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
+Requiring indemnification of licensors and authors of that material by
+anyone who conveys the material (or modified versions of it) with
+contractual assumptions of liability to the recipient, for any
+liability that these contractual assumptions directly impose on those
+licensors and authors.
+@end enumerate
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and ``any
-later version'', you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+All other non-permissive additional terms are considered ``further
+restrictions'' within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
+
+@item Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+@item Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run
+a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+@item Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+An ``entity transaction'' is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+@item Patents.
+
+A ``contributor'' is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's ``contributor version''.
+
+A contributor's ``essential patent claims'' are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, ``control'' includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
 
-@item
-If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a ``patent license'' is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To ``grant'' such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  ``Knowingly relying'' means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is ``discriminatory'' if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License.  You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+@item No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey
+a covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all.  For example, if you agree
+to terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+@item Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+@item Revised Versions of this License.
 
-@iftex
-@heading NO WARRANTY
-@end iftex
-@ifinfo
-@center NO WARRANTY
-@end ifinfo
+The Free Software Foundation may publish revised and/or new versions
+of the GNU General Public License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
 
-@item
-BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM ``AS IS'' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
+Each version is given a distinguishing version number.  If the Program
+specifies that a certain numbered version of the GNU General Public
+License ``or any later version'' applies to it, you have the option of
+following the terms and conditions either of that numbered version or
+of any later version published by the Free Software Foundation.  If
+the Program does not specify a version number of the GNU General
+Public License, you may choose any version ever published by the Free
+Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions
+of the GNU General Public License can be used, that proxy's public
+statement of acceptance of a version permanently authorizes you to
+choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+@item Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM ``AS IS'' WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+@item Limitation of Liability.
 
-@item
 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-@end enumerate
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+@item Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
 
 @iftex
 @heading END OF TERMS AND CONDITIONS
@@ -323,75 +665,61 @@ POSSIBILITY OF SUCH DAMAGES.
 @ifinfo
 @center END OF TERMS AND CONDITIONS
 @end ifinfo
-
-@page
 @unnumberedsec How to Apply These Terms to Your New Programs
 
-  If you develop a new program, and you want it to be of the greatest
+If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
+free software which everyone can redistribute and change under these
+terms.
 
-  To do so, attach the following notices to the program.  It is safest
+To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the ``copyright'' line and a pointer to where the full notice is found.
-
 @smallexample
-@var{one line to give the program's name and an idea of what it does.}
-Copyright (C) 19@var{yy}  @var{name of author}
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU 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.
-@end smallexample
+@var{one line to give the program's name and a brief idea of what it does.}  
+Copyright (C) @var{year} @var{name of author}
 
-Also add information on how to contact you by electronic and paper mail.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-@smallexample
-Gnomovision version 69, Copyright (C) 19@var{yy} @var{name of author}
-Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
-type `show w'.  This is free software, and you are welcome
-to redistribute it under certain conditions; type `show c' 
-for details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see @url{http://www.gnu.org/licenses/}.
 @end smallexample
 
-The hypothetical commands @samp{show w} and @samp{show c} should show
-the appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than @samp{show w} and
-@samp{show c}; they could even be mouse-clicks or menu items---whatever
-suits your program.
+Also add information on how to contact you by electronic and paper mail.
 
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a ``copyright disclaimer'' for the program, if
-necessary.  Here is a sample; alter the names:
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
 @smallexample
-@group
-Yoyodyne, Inc., hereby disclaims all copyright
-interest in the program `Gnomovision'
-(which makes passes at compilers) written 
-by James Hacker.
-
-@var{signature of Ty Coon}, 1 April 1989
-Ty Coon, President of Vice
-@end group
+@var{program} Copyright (C) @var{year} @var{name of author} 
+This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
+This is free software, and you are welcome to redistribute it under certain conditions; type @samp{show c} for details.
 @end smallexample
 
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+The hypothetical commands @samp{show w} and @samp{show c} should show
+the appropriate parts of the General Public License.  Of course, your
+program's commands might be different; for a GUI interface, you would
+use an ``about box''.
+
+You should also get your employer (if you work as a programmer) or school,
+if any, to sign a ``copyright disclaimer'' for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+@url{http://www.gnu.org/licenses/}.
+
+The GNU General Public License does not permit incorporating your
+program into proprietary programs.  If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library.  If this is what you want to do, use
+the GNU Lesser General Public License instead of this License.  But
+first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
+
+@end enumerate
diff --git a/doc/yat2m.c b/doc/yat2m.c
index e250db4d5..0062cbe8b 100644
--- a/doc/yat2m.c
+++ b/doc/yat2m.c
@@ -4,7 +4,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 433b609cc..28abd44c8 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-23  Werner Koch  <[email protected]>
+
+	Switched entire package to GPLv3+.
+
 2007-10-22  David Shaw  <[email protected]>
 
 	* gpg.c (main): Add --require-cross-certification to
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 74a8db1d2..5ca68322d 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -5,7 +5,7 @@
 #
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
 # 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
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/intl @LIBUSB_CPPFLAGS@
diff --git a/g10/apdu.c b/g10/apdu.c
index 52fdbc723..cde6a48c2 100644
--- a/g10/apdu.c
+++ b/g10/apdu.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * $Id$
  */
diff --git a/g10/apdu.h b/g10/apdu.h
index c3af82506..92d073897 100644
--- a/g10/apdu.h
+++ b/g10/apdu.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * $Id$
  */
diff --git a/g10/app-common.h b/g10/app-common.h
index c80bfb527..0e28487eb 100644
--- a/g10/app-common.h
+++ b/g10/app-common.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * $Id$
  */
diff --git a/g10/app-openpgp.c b/g10/app-openpgp.c
index 102e52329..64b8cf47e 100644
--- a/g10/app-openpgp.c
+++ b/g10/app-openpgp.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * $Id$
  */
diff --git a/g10/armor.c b/g10/armor.c
index 4dff04245..27c7e6fc8 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/build-packet.c b/g10/build-packet.c
index a7ac5d829..4db1d5830 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/card-util.c b/g10/card-util.c
index 0c8365405..0ada8fa94 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/cardglue.c b/g10/cardglue.c
index 1bfb9e413..b09aec3fe 100644
--- a/g10/cardglue.c
+++ b/g10/cardglue.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/cardglue.h b/g10/cardglue.h
index b1f2811df..e36f6110f 100644
--- a/g10/cardglue.h
+++ b/g10/cardglue.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GNUPG_G10_CARDGLUE_H
 #define GNUPG_G10_CARDGLUE_H 
diff --git a/g10/ccid-driver.c b/g10/ccid-driver.c
index 1e87ae578..97e7bf9c6 100644
--- a/g10/ccid-driver.c
+++ b/g10/ccid-driver.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * ALTERNATIVELY, this file may be distributed under the terms of the
  * following license, in which case the provisions of this license are
diff --git a/g10/ccid-driver.h b/g10/ccid-driver.h
index 6f6527108..341876b22 100644
--- a/g10/ccid-driver.h
+++ b/g10/ccid-driver.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * ALTERNATIVELY, this file may be distributed under the terms of the
  * following license, in which case the provisions of this license are
diff --git a/g10/cipher.c b/g10/cipher.c
index f7332ba3e..0c51100cc 100644
--- a/g10/cipher.c
+++ b/g10/cipher.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/compress-bz2.c b/g10/compress-bz2.c
index 7a8075ae4..53b65ef3a 100644
--- a/g10/compress-bz2.c
+++ b/g10/compress-bz2.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/compress.c b/g10/compress.c
index 0cee5ae54..fd9a73229 100644
--- a/g10/compress.c
+++ b/g10/compress.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Note that the code in compress-bz2.c is nearly identical to the
diff --git a/g10/dearmor.c b/g10/dearmor.c
index 8d7c60a5f..14abeb436 100644
--- a/g10/dearmor.c
+++ b/g10/dearmor.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/decrypt.c b/g10/decrypt.c
index 6d48037c0..825a07268 100644
--- a/g10/decrypt.c
+++ b/g10/decrypt.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/delkey.c b/g10/delkey.c
index 354851d1f..3d541e341 100644
--- a/g10/delkey.c
+++ b/g10/delkey.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/encode.c b/g10/encode.c
index 0315a8dce..fb40a53cd 100644
--- a/g10/encode.c
+++ b/g10/encode.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/encr-data.c b/g10/encr-data.c
index acb090abe..a3a9728cb 100644
--- a/g10/encr-data.c
+++ b/g10/encr-data.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/exec.c b/g10/exec.c
index d99bb5e1e..e54e86ccd 100644
--- a/g10/exec.c
+++ b/g10/exec.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/exec.h b/g10/exec.h
index b4a6f0ec1..15eb34d94 100644
--- a/g10/exec.h
+++ b/g10/exec.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _EXEC_H_
diff --git a/g10/export.c b/g10/export.c
index 626b7d06c..9f642f4d9 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/filter.h b/g10/filter.h
index c9fe872d2..54a41523c 100644
--- a/g10/filter.h
+++ b/g10/filter.h
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_FILTER_H
 #define G10_FILTER_H
diff --git a/g10/free-packet.c b/g10/free-packet.c
index be49bb5e4..0f8e0e8ce 100644
--- a/g10/free-packet.c
+++ b/g10/free-packet.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/getkey.c b/g10/getkey.c
index eb1d91f6a..776bed2e1 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/global.h b/g10/global.h
index 1b2f872b1..643c4fc9b 100644
--- a/g10/global.h
+++ b/g10/global.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GPG_GLOBAL_H
diff --git a/g10/gpg.c b/g10/gpg.c
index 8a265d632..0c28bc113 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/gpgv.c b/g10/gpgv.c
index 9939ca6d4..16634a61c 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/helptext.c b/g10/helptext.c
index e1f785191..dbb6d8553 100644
--- a/g10/helptext.c
+++ b/g10/helptext.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/import.c b/g10/import.c
index 56f90f703..c24a4b751 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/iso7816.c b/g10/iso7816.c
index 5b985324f..8c6af044f 100644
--- a/g10/iso7816.c
+++ b/g10/iso7816.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * $Id$
  */
diff --git a/g10/iso7816.h b/g10/iso7816.h
index 04c7ae63e..a9dd9ee44 100644
--- a/g10/iso7816.h
+++ b/g10/iso7816.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * $Id$
  */
diff --git a/g10/kbnode.c b/g10/kbnode.c
index 9038f5b44..7486439f9 100644
--- a/g10/kbnode.c
+++ b/g10/kbnode.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/keydb.c b/g10/keydb.c
index b1a726858..a791a4d4e 100644
--- a/g10/keydb.c
+++ b/g10/keydb.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/keydb.h b/g10/keydb.h
index b58838108..7634d5443 100644
--- a/g10/keydb.h
+++ b/g10/keydb.h
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_KEYDB_H
diff --git a/g10/keyedit.c b/g10/keyedit.c
index c8ddd3f1e..d3d92895f 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/keygen.c b/g10/keygen.c
index bb71858a8..64c075065 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/keyid.c b/g10/keyid.c
index 86a204ff3..4e162dd32 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/keylist.c b/g10/keylist.c
index 19f3d3f62..4198729ac 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/keyring.c b/g10/keyring.c
index 5d107319d..1259c0b1b 100644
--- a/g10/keyring.c
+++ b/g10/keyring.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/keyring.h b/g10/keyring.h
index 8c4ea73d4..f1870b799 100644
--- a/g10/keyring.h
+++ b/g10/keyring.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GPG_KEYRING_H
diff --git a/g10/keyserver-internal.h b/g10/keyserver-internal.h
index a36598695..3bceddc54 100644
--- a/g10/keyserver-internal.h
+++ b/g10/keyserver-internal.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _KEYSERVER_INTERNAL_H_
diff --git a/g10/keyserver.c b/g10/keyserver.c
index b14d30087..7915aff51 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/main.h b/g10/main.h
index b6892049f..63a2b04fd 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_MAIN_H
 #define G10_MAIN_H
diff --git a/g10/mainproc.c b/g10/mainproc.c
index c80c7df22..03182b61b 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/mdfilter.c b/g10/mdfilter.c
index 3605db8bf..9c0059e05 100644
--- a/g10/mdfilter.c
+++ b/g10/mdfilter.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/misc.c b/g10/misc.c
index 21896c349..6b77cb7e8 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/openfile.c b/g10/openfile.c
index d142f6712..94d00cf24 100644
--- a/g10/openfile.c
+++ b/g10/openfile.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/options.h b/g10/options.h
index 64e105b1f..756a8edc1 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_OPTIONS_H
 #define G10_OPTIONS_H
diff --git a/g10/packet.h b/g10/packet.h
index 89ec62c9c..c0f12ee78 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_PACKET_H
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 18cc19a56..5694fe648 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/passphrase.c b/g10/passphrase.c
index 4dd2f836d..de4ca6cf1 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/photoid.c b/g10/photoid.c
index 3676d3869..7993a216c 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/photoid.h b/g10/photoid.h
index d13669c52..88da4fb10 100644
--- a/g10/photoid.h
+++ b/g10/photoid.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Photo ID functions */
diff --git a/g10/pipemode.c b/g10/pipemode.c
index 750aa3b54..2b0978959 100644
--- a/g10/pipemode.c
+++ b/g10/pipemode.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 0d99c6d6d..d844b661e 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/plaintext.c b/g10/plaintext.c
index b05aead47..f847a12c5 100644
--- a/g10/plaintext.c
+++ b/g10/plaintext.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c
index cffa79c62..041409a14 100644
--- a/g10/pubkey-enc.c
+++ b/g10/pubkey-enc.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/revoke.c b/g10/revoke.c
index c2deefa83..32b269f29 100644
--- a/g10/revoke.c
+++ b/g10/revoke.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c
index 79cf22aeb..74f80c463 100644
--- a/g10/seckey-cert.c
+++ b/g10/seckey-cert.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/seskey.c b/g10/seskey.c
index b25980312..42e26fc4e 100644
--- a/g10/seskey.c
+++ b/g10/seskey.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/sig-check.c b/g10/sig-check.c
index 15703346c..a01b7e083 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/sign.c b/g10/sign.c
index d57112354..09c26628f 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/signal.c b/g10/signal.c
index 2e40af13a..08c790c1a 100644
--- a/g10/signal.c
+++ b/g10/signal.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/skclist.c b/g10/skclist.c
index 5e55e24ef..6394e55df 100644
--- a/g10/skclist.c
+++ b/g10/skclist.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/status.c b/g10/status.c
index 627f41f73..de33b468e 100644
--- a/g10/status.c
+++ b/g10/status.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/status.h b/g10/status.h
index 52f6b2081..cbc6e7eaa 100644
--- a/g10/status.h
+++ b/g10/status.h
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_STATUS_H
 #define G10_STATUS_H
diff --git a/g10/tdbdump.c b/g10/tdbdump.c
index 09ce11949..e6da3e61b 100644
--- a/g10/tdbdump.c
+++ b/g10/tdbdump.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/tdbio.c b/g10/tdbio.c
index fbd569dd2..0ad0f1e02 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/tdbio.h b/g10/tdbio.h
index 80a70d9f4..d6af98fd0 100644
--- a/g10/tdbio.h
+++ b/g10/tdbio.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_TDBIO_H
diff --git a/g10/textfilter.c b/g10/textfilter.c
index 8665a7200..dc72a56fc 100644
--- a/g10/textfilter.c
+++ b/g10/textfilter.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/tlv.c b/g10/tlv.c
index c7233e076..dd67a88ac 100644
--- a/g10/tlv.c
+++ b/g10/tlv.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/tlv.h b/g10/tlv.h
index 877573d25..66ea871bc 100644
--- a/g10/tlv.h
+++ b/g10/tlv.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef SCD_TLV_H
diff --git a/g10/trustdb.c b/g10/trustdb.c
index e372bf8fb..9e0a3ada9 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/g10/trustdb.h b/g10/trustdb.h
index 2d0581f9b..8c6721532 100644
--- a/g10/trustdb.h
+++ b/g10/trustdb.h
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_TRUSTDB_H
diff --git a/g10/verify.c b/g10/verify.c
index 2c1b36ccf..664a57c3b 100644
--- a/g10/verify.c
+++ b/g10/verify.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/include/ChangeLog b/include/ChangeLog
index 8a96d5008..1ef67dbdd 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-23  Werner Koch  <[email protected]>
+
+	Switched entire package to GPLv3+.
+	* assuan.h, _regex.h: Just change the address notice.
+
 2007-08-24  Werner Koch  <[email protected]>
 
 	* util.h (same_file_p): Add prototype.
diff --git a/include/_regex.h b/include/_regex.h
index 88acc352d..904627b12 100644
--- a/include/_regex.h
+++ b/include/_regex.h
@@ -14,10 +14,9 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02110-1301 USA.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. 
+*/
 
 #ifndef _REGEX_H
 #define _REGEX_H 1
diff --git a/include/assuan.h b/include/assuan.h
index 683f55bc1..1170f959d 100644
--- a/include/assuan.h
+++ b/include/assuan.h
@@ -14,10 +14,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser 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. 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>. 
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/include/cipher.h b/include/cipher.h
index 09577c240..543f1665a 100644
--- a/include/cipher.h
+++ b/include/cipher.h
@@ -6,7 +6,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_CIPHER_H
 #define G10_CIPHER_H
diff --git a/include/dynload.h b/include/dynload.h
index acdf5c879..4ff96180a 100644
--- a/include/dynload.h
+++ b/include/dynload.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GNUPG_DYNLOAD_H
diff --git a/include/errors.h b/include/errors.h
index 177353b7e..63db6fca6 100644
--- a/include/errors.h
+++ b/include/errors.h
@@ -5,7 +5,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_ERRORS_H
 #define G10_ERRORS_H
diff --git a/include/host2net.h b/include/host2net.h
index d72b828d0..fe0ec41fd 100644
--- a/include/host2net.h
+++ b/include/host2net.h
@@ -5,7 +5,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_HOST2NET_H
diff --git a/include/http.h b/include/http.h
index 060b5b8fc..9ee6deadb 100644
--- a/include/http.h
+++ b/include/http.h
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_HTTP_H
diff --git a/include/i18n.h b/include/i18n.h
index 6abd2dce3..62f9543b5 100644
--- a/include/i18n.h
+++ b/include/i18n.h
@@ -5,7 +5,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_I18N_H
diff --git a/include/iobuf.h b/include/iobuf.h
index a1d58c9c6..9515a0e10 100644
--- a/include/iobuf.h
+++ b/include/iobuf.h
@@ -5,7 +5,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_IOBUF_H
diff --git a/include/keyserver.h b/include/keyserver.h
index 8900dbe6e..f4c8e4769 100644
--- a/include/keyserver.h
+++ b/include/keyserver.h
@@ -5,7 +5,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _KEYSERVER_H_
diff --git a/include/memory.h b/include/memory.h
index 895d8a771..84e92b473 100644
--- a/include/memory.h
+++ b/include/memory.h
@@ -5,7 +5,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_MEMORY_H
diff --git a/include/mpi.h b/include/mpi.h
index 81061d39c..a027d2a79 100644
--- a/include/mpi.h
+++ b/include/mpi.h
@@ -6,7 +6,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/include/ttyio.h b/include/ttyio.h
index 2c52fc3e9..ed064ecde 100644
--- a/include/ttyio.h
+++ b/include/ttyio.h
@@ -5,7 +5,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_TTYIO_H
 #define G10_TTYIO_H
diff --git a/include/types.h b/include/types.h
index 3b85b10e1..f57f33ab6 100644
--- a/include/types.h
+++ b/include/types.h
@@ -5,7 +5,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef G10_TYPES_H
diff --git a/include/util.h b/include/util.h
index 8c48e8c64..e8fe9a590 100644
--- a/include/util.h
+++ b/include/util.h
@@ -6,7 +6,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_UTIL_H
 #define G10_UTIL_H
diff --git a/include/zlib-riscos.h b/include/zlib-riscos.h
index 6a27b86ef..0f547d380 100644
--- a/include/zlib-riscos.h
+++ b/include/zlib-riscos.h
@@ -5,7 +5,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef G10_ZLIB_RISCOS_H
 #define G10_ZLIB_RISCOS_H
diff --git a/intl/ChangeLog b/intl/ChangeLog
index 751291929..a1e3707ed 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,4 +1,4 @@
-2004-01-29  GNU  <[email protected]>
+2006-11-27  GNU  <[email protected]>
 
-	* Version 0.14.1 released.
+	* Version 0.16.1 released.
 
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 1ad087adf..525922e11 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for directory with message catalog handling library of GNU gettext
-# Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
+# Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Library General Public License as published
@@ -24,6 +24,17 @@ SHELL = /bin/sh
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = ..
+
+# The VPATH variables allows builds with $builddir != $srcdir, assuming a
+# 'make' program that supports VPATH (such as GNU make). This line is removed
+# by autoconf automatically when "$(srcdir)" = ".".
+# In this directory, the VPATH handling is particular:
+# 1. If INTL_LIBTOOL_SUFFIX_PREFIX is 'l' (indicating a build with libtool),
+#    the .c -> .lo rules carefully use $(srcdir), so that VPATH can be omitted.
+# 2. If PACKAGE = gettext-tools, VPATH _must_ be omitted, because otherwise
+#    'make' does the wrong thing if GNU gettext was configured with
+#    "./configure --srcdir=`pwd`", namely it gets confused by the .lo and .la
+#    files it finds in srcdir = ../../gettext-runtime/intl.
 VPATH = $(srcdir)
 
 prefix = @prefix@
@@ -31,6 +42,7 @@ exec_prefix = @exec_prefix@
 transform = @program_transform_name@
 libdir = @libdir@
 includedir = @includedir@
+datarootdir = @datarootdir@
 datadir = @datadir@
 localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/intl
@@ -39,8 +51,18 @@ subdir = intl
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
 
 l = @INTL_LIBTOOL_SUFFIX_PREFIX@
 
@@ -51,15 +73,19 @@ RANLIB = @RANLIB@
 YACC = @INTLBISON@ -y -d
 YFLAGS = --name-prefix=__gettext
 
+# -DBUILDING_LIBINTL: Change expansion of LIBINTL_DLL_EXPORTED macro.
+# -DBUILDING_DLL: Change expansion of RELOCATABLE_DLL_EXPORTED macro.
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \
+-DLIBDIR=\"$(libdir)\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL \
 -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
 -Dset_relocation_prefix=libintl_set_relocation_prefix \
 -Drelocate=libintl_relocate \
 -DDEPENDS_ON_LIBICONV=1 @DEFS@
 CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
+CFLAGS = @CFLAGS@ @CFLAG_VISIBILITY@
+LDFLAGS = @LDFLAGS@ $(LDFLAGS_@WOE32DLL@)
+LDFLAGS_yes = -Wl,--export-all-symbols
+LDFLAGS_no =
 LIBS = @LIBS@
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
@@ -72,6 +98,7 @@ HEADERS = \
   plural-exp.h \
   eval-plural.h \
   localcharset.h \
+  lock.h \
   relocatable.h \
   xsize.h \
   printf-args.h printf-args.c \
@@ -85,6 +112,7 @@ SOURCES = \
   dgettext.c \
   gettext.c \
   finddomain.c \
+  hash-string.c \
   loadmsgcat.c \
   localealias.c \
   textdomain.c \
@@ -97,12 +125,16 @@ SOURCES = \
   plural.y \
   plural-exp.c \
   localcharset.c \
+  lock.c \
   relocatable.c \
+  langprefs.c \
   localename.c \
   log.c \
   printf.c \
+  version.c \
   osdep.c \
   os2compat.c \
+  intl-exports.c \
   intl-compat.c
 OBJECTS = \
   bindtextdom.$lo \
@@ -110,6 +142,7 @@ OBJECTS = \
   dgettext.$lo \
   gettext.$lo \
   finddomain.$lo \
+  hash-string.$lo \
   loadmsgcat.$lo \
   localealias.$lo \
   textdomain.$lo \
@@ -122,21 +155,25 @@ OBJECTS = \
   plural.$lo \
   plural-exp.$lo \
   localcharset.$lo \
+  lock.$lo \
   relocatable.$lo \
+  langprefs.$lo \
   localename.$lo \
   log.$lo \
   printf.$lo \
+  version.$lo \
   osdep.$lo \
   intl-compat.$lo
 DISTFILES.common = Makefile.in \
-config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
+config.charset locale.alias ref-add.sin ref-del.sin export.h \
+$(HEADERS) $(SOURCES)
 DISTFILES.generated = plural.c
 DISTFILES.normal = VERSION
-DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \
-libgnuintl.h_vms Makefile.vms \
-libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc
+DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc README.woe32
 DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
-COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
+COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h \
+libgnuintl.h_vms Makefile.vms libgnuintl.h.msvc-static \
+libgnuintl.h.msvc-shared Makefile.msvc
 
 all: all-@USE_INCLUDED_LIBINTL@
 all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
@@ -152,7 +189,7 @@ libintl.a libgnuintl.a: $(OBJECTS)
 libintl.la libgnuintl.la: $(OBJECTS)
 	$(LIBTOOL) --mode=link \
 	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
-	  $(OBJECTS) @LTLIBICONV@ $(LIBS) -lc \
+	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ -lc \
 	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
 	  -rpath $(libdir) \
 	  -no-undefined
@@ -162,9 +199,9 @@ libintl.la libgnuintl.la: $(OBJECTS)
 # according to the libtool documentation, section "Library interface versions".
 # Maintainers of other packages that include the intl directory must *not*
 # change these values.
-LTV_CURRENT=7
-LTV_REVISION=0
-LTV_AGE=4
+LTV_CURRENT=8
+LTV_REVISION=1
+LTV_AGE=0
 
 .SUFFIXES:
 .SUFFIXES: .c .y .o .lo .sin .sed
@@ -186,6 +223,8 @@ gettext.lo: $(srcdir)/gettext.c
 	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c
 finddomain.lo: $(srcdir)/finddomain.c
 	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c
+hash-string.lo: $(srcdir)/hash-string.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/hash-string.c
 loadmsgcat.lo: $(srcdir)/loadmsgcat.c
 	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c
 localealias.lo: $(srcdir)/localealias.c
@@ -210,14 +249,20 @@ plural-exp.lo: $(srcdir)/plural-exp.c
 	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c
 localcharset.lo: $(srcdir)/localcharset.c
 	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
+lock.lo: $(srcdir)/lock.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/lock.c
 relocatable.lo: $(srcdir)/relocatable.c
 	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
+langprefs.lo: $(srcdir)/langprefs.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/langprefs.c
 localename.lo: $(srcdir)/localename.c
 	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
 log.lo: $(srcdir)/log.c
 	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c
 printf.lo: $(srcdir)/printf.c
 	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c
+version.lo: $(srcdir)/version.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/version.c
 osdep.lo: $(srcdir)/osdep.c
 	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c
 intl-compat.lo: $(srcdir)/intl-compat.c
@@ -233,14 +278,29 @@ ref-del.sed: $(srcdir)/ref-del.sin
 INCLUDES = -I. -I$(srcdir) -I..
 
 libgnuintl.h: $(srcdir)/libgnuintl.h.in
-	sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
+	sed -e '/IN_LIBGLOCALE/d' \
+	    -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
 	    -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
 	    -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
 	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
-	  < $(srcdir)/libgnuintl.h.in > libgnuintl.h
-
-libintl.h: libgnuintl.h
-	cp libgnuintl.h libintl.h
+	  < $(srcdir)/libgnuintl.h.in \
+	| if test '@WOE32DLL@' = yes; then \
+	    sed -e 's/extern \([^()]*\);/extern __declspec (dllimport) \1;/'; \
+	  else \
+	    cat; \
+	  fi \
+	| sed -e 's/extern \([^"]\)/extern LIBINTL_DLL_EXPORTED \1/' \
+	      -e "/#define _LIBINTL_H/r $(srcdir)/export.h" \
+	| sed -e 's,@''HAVE_VISIBILITY''@,@HAVE_VISIBILITY@,g' \
+	  > libgnuintl.h
+
+libintl.h: $(srcdir)/libgnuintl.h.in
+	sed -e '/IN_LIBGLOCALE/d' \
+	    -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
+	    -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
+	    -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
+	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
+	  < $(srcdir)/libgnuintl.h.in > libintl.h
 
 charset.alias: $(srcdir)/config.charset
 	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
@@ -257,7 +317,7 @@ install: install-exec install-data
 install-exec: all
 	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
 	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+	  $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
 	  $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
 	  $(LIBTOOL) --mode=install \
 	    $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
@@ -271,8 +331,9 @@ install-exec: all
 	  : ; \
 	fi
 	if test "$(PACKAGE)" = "gettext-tools" \
-	   && test '@USE_INCLUDED_LIBINTL@' = no; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
+	   && test '@USE_INCLUDED_LIBINTL@' = no \
+	   && test @GLIBC2@ != no; then \
+	  $(mkdir_p) $(DESTDIR)$(libdir); \
 	  $(LIBTOOL) --mode=install \
 	    $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
 	  rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
@@ -283,7 +344,7 @@ install-exec: all
 	  : ; \
 	fi
 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+	  test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \
 	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
 	  dest=$(DESTDIR)$(libdir)/charset.alias; \
 	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
@@ -299,7 +360,7 @@ install-exec: all
 	      rm -f $$temp; \
 	    fi; \
 	  fi; \
-	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
+	  $(mkdir_p) $(DESTDIR)$(localedir); \
 	  test -f $(DESTDIR)$(localedir)/locale.alias \
 	    && orig=$(DESTDIR)$(localedir)/locale.alias \
 	    || orig=$(srcdir)/locale.alias; \
@@ -313,7 +374,7 @@ install-exec: all
 	fi
 install-data: all
 	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
 	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
 	  dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
@@ -341,24 +402,25 @@ install-strip: install
 installdirs:
 	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
 	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+	  $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
 	else \
 	  : ; \
 	fi
 	if test "$(PACKAGE)" = "gettext-tools" \
-	   && test '@USE_INCLUDED_LIBINTL@' = no; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
+	   && test '@USE_INCLUDED_LIBINTL@' = no \
+	   && test @GLIBC2@ != no; then \
+	  $(mkdir_p) $(DESTDIR)$(libdir); \
 	else \
 	  : ; \
 	fi
 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
-	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
+	  test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \
+	  $(mkdir_p) $(DESTDIR)$(localedir); \
 	else \
 	  : ; \
 	fi
 	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	else \
 	  : ; \
 	fi
@@ -376,7 +438,8 @@ uninstall:
 	  : ; \
 	fi
 	if test "$(PACKAGE)" = "gettext-tools" \
-	   && test '@USE_INCLUDED_LIBINTL@' = no; then \
+	   && test '@USE_INCLUDED_LIBINTL@' = no \
+	   && test @GLIBC2@ != no; then \
 	  rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
 	else \
 	  : ; \
@@ -419,14 +482,20 @@ info dvi ps pdf html:
 
 $(OBJECTS): ../config.h libgnuintl.h
 bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
-dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h
+hash-string.$lo dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h
 explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h
 dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h
 dcigettext.$lo: $(srcdir)/eval-plural.h
 localcharset.$lo: $(srcdir)/localcharset.h
+bindtextdom.$lo dcigettext.$lo finddomain.$lo loadmsgcat.$lo localealias.$lo lock.$lo log.$lo: $(srcdir)/lock.h
 localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h
 printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c
 
+# A bison-2.1 generated plural.c includes <libintl.h> if ENABLE_NLS.
+PLURAL_DEPS_yes = libintl.h
+PLURAL_DEPS_no =
+plural.$lo: $(PLURAL_DEPS_@USE_INCLUDED_LIBINTL@)
+
 tags: TAGS
 
 TAGS: $(HEADERS) $(SOURCES)
@@ -478,7 +547,7 @@ dist distdir: Makefile
 	  $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
 	  for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
 	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	    cp -p $$dir/$$file $(distdir); \
+	    cp -p $$dir/$$file $(distdir) || test $$file = Makefile.in || exit 1; \
 	  done; \
 	fi
 
@@ -486,7 +555,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status
 # This would be more efficient, but doesn't work any more with autoconf-2.57,
 # when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used.
-#	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+#	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/intl/VERSION b/intl/VERSION
index b4b846ca7..2525c4ea8 100644
--- a/intl/VERSION
+++ b/intl/VERSION
@@ -1 +1 @@
-GNU gettext library from gettext-0.14.1
+GNU gettext library from gettext-0.16.1
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index 7a2606264..d1b1f9028 100644
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -1,5 +1,5 @@
 /* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2003, 2005-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -24,21 +24,21 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
 # include "libgnuintl.h"
 #endif
-#include "gettextP.h"
 
+/* Handle multi-threaded applications.  */
 #ifdef _LIBC
-/* We have to handle multi-threaded applications.  */
 # include <bits/libc-lock.h>
+# define gl_rwlock_define __libc_rwlock_define
+# define gl_rwlock_wrlock __libc_rwlock_wrlock
+# define gl_rwlock_unlock __libc_rwlock_unlock
 #else
-/* Provide dummy implementation if this is outside glibc.  */
-# define __libc_rwlock_define(CLASS, NAME)
-# define __libc_rwlock_wrlock(NAME)
-# define __libc_rwlock_unlock(NAME)
+# include "lock.h"
 #endif
 
 /* The internal variables in the standalone libintl.a must have different
@@ -59,16 +59,14 @@
 /* Contains the default location of the message catalogs.  */
 extern const char _nl_default_dirname[];
 #ifdef _LIBC
-extern const char _nl_default_dirname_internal[] attribute_hidden;
-#else
-# define INTUSE(name) name
+libc_hidden_proto (_nl_default_dirname)
 #endif
 
 /* List with bindings of specific domains.  */
 extern struct binding *_nl_domain_bindings;
 
 /* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
+gl_rwlock_define (extern, _nl_state_lock attribute_hidden)
 
 
 /* Names for the libintl functions are a problem.  They must not clash
@@ -109,7 +107,7 @@ set_binding_values (const char *domainname,
       return;
     }
 
-  __libc_rwlock_wrlock (_nl_state_lock);
+  gl_rwlock_wrlock (_nl_state_lock);
 
   modified = 0;
 
@@ -144,8 +142,8 @@ set_binding_values (const char *domainname,
 	      char *result = binding->dirname;
 	      if (strcmp (dirname, result) != 0)
 		{
-		  if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
-		    result = (char *) INTUSE(_nl_default_dirname);
+		  if (strcmp (dirname, _nl_default_dirname) == 0)
+		    result = (char *) _nl_default_dirname;
 		  else
 		    {
 #if defined _LIBC || defined HAVE_STRDUP
@@ -160,7 +158,7 @@ set_binding_values (const char *domainname,
 
 		  if (__builtin_expect (result != NULL, 1))
 		    {
-		      if (binding->dirname != INTUSE(_nl_default_dirname))
+		      if (binding->dirname != _nl_default_dirname)
 			free (binding->dirname);
 
 		      binding->dirname = result;
@@ -201,7 +199,6 @@ set_binding_values (const char *domainname,
 			free (binding->codeset);
 
 		      binding->codeset = result;
-		      binding->codeset_cntr++;
 		      modified = 1;
 		    }
 		}
@@ -214,7 +211,7 @@ set_binding_values (const char *domainname,
     {
       /* Simply return the default values.  */
       if (dirnamep)
-	*dirnamep = INTUSE(_nl_default_dirname);
+	*dirnamep = _nl_default_dirname;
       if (codesetp)
 	*codesetp = NULL;
     }
@@ -236,11 +233,11 @@ set_binding_values (const char *domainname,
 
 	  if (dirname == NULL)
 	    /* The default value.  */
-	    dirname = INTUSE(_nl_default_dirname);
+	    dirname = _nl_default_dirname;
 	  else
 	    {
-	      if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
-		dirname = INTUSE(_nl_default_dirname);
+	      if (strcmp (dirname, _nl_default_dirname) == 0)
+		dirname = _nl_default_dirname;
 	      else
 		{
 		  char *result;
@@ -263,9 +260,7 @@ set_binding_values (const char *domainname,
 	}
       else
 	/* The default value.  */
-	new_binding->dirname = (char *) INTUSE(_nl_default_dirname);
-
-      new_binding->codeset_cntr = 0;
+	new_binding->dirname = (char *) _nl_default_dirname;
 
       if (codesetp)
 	{
@@ -287,7 +282,6 @@ set_binding_values (const char *domainname,
 	      memcpy (result, codeset, len);
 #endif
 	      codeset = result;
-	      new_binding->codeset_cntr++;
 	    }
 	  *codesetp = codeset;
 	  new_binding->codeset = (char *) codeset;
@@ -319,7 +313,7 @@ set_binding_values (const char *domainname,
       if (0)
 	{
 	failed_codeset:
-	  if (new_binding->dirname != INTUSE(_nl_default_dirname))
+	  if (new_binding->dirname != _nl_default_dirname)
 	    free (new_binding->dirname);
 	failed_dirname:
 	  free (new_binding);
@@ -335,7 +329,7 @@ set_binding_values (const char *domainname,
   if (modified)
     ++_nl_msg_cat_cntr;
 
-  __libc_rwlock_unlock (_nl_state_lock);
+  gl_rwlock_unlock (_nl_state_lock);
 }
 
 /* Specify that the DOMAINNAME message catalog will be found
diff --git a/intl/config.charset b/intl/config.charset
index d4964dc4e..e8c258b3f 100755
--- a/intl/config.charset
+++ b/intl/config.charset
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000-2004 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2004, 2006 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify it
 #   under the terms of the GNU Library General Public License as published
@@ -31,21 +31,21 @@
 # The current list of GNU canonical charset names is as follows.
 #
 #       name              MIME?             used by which systems
-#   ASCII, ANSI_X3.4-1968       glibc solaris freebsd darwin
-#   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd darwin
-#   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd darwin
+#   ASCII, ANSI_X3.4-1968       glibc solaris freebsd netbsd darwin
+#   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd netbsd darwin
+#   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd netbsd darwin
 #   ISO-8859-3              Y   glibc solaris
-#   ISO-8859-4              Y   osf solaris freebsd darwin
-#   ISO-8859-5              Y   glibc aix hpux irix osf solaris freebsd darwin
+#   ISO-8859-4              Y   osf solaris freebsd netbsd darwin
+#   ISO-8859-5              Y   glibc aix hpux irix osf solaris freebsd netbsd darwin
 #   ISO-8859-6              Y   glibc aix hpux solaris
-#   ISO-8859-7              Y   glibc aix hpux irix osf solaris
+#   ISO-8859-7              Y   glibc aix hpux irix osf solaris netbsd darwin
 #   ISO-8859-8              Y   glibc aix hpux osf solaris
-#   ISO-8859-9              Y   glibc aix hpux irix osf solaris
-#   ISO-8859-13                 glibc
+#   ISO-8859-9              Y   glibc aix hpux irix osf solaris darwin
+#   ISO-8859-13                 glibc netbsd darwin
 #   ISO-8859-14                 glibc
-#   ISO-8859-15                 glibc aix osf solaris freebsd
-#   KOI8-R                  Y   glibc solaris freebsd darwin
-#   KOI8-U                  Y   glibc freebsd darwin
+#   ISO-8859-15                 glibc aix osf solaris freebsd darwin
+#   KOI8-R                  Y   glibc solaris freebsd netbsd darwin
+#   KOI8-U                  Y   glibc freebsd netbsd darwin
 #   KOI8-T                      glibc
 #   CP437                       dos
 #   CP775                       dos
@@ -58,7 +58,7 @@
 #   CP862                       dos
 #   CP864                       dos
 #   CP865                       dos
-#   CP866                       freebsd darwin dos
+#   CP866                       freebsd netbsd darwin dos
 #   CP869                       dos
 #   CP874                       woe32 dos
 #   CP922                       aix
@@ -71,22 +71,22 @@
 #   CP1125                      dos
 #   CP1129                      aix
 #   CP1250                      woe32
-#   CP1251                      glibc solaris darwin woe32
+#   CP1251                      glibc solaris netbsd darwin woe32
 #   CP1252                      aix woe32
 #   CP1253                      woe32
 #   CP1254                      woe32
 #   CP1255                      glibc woe32
 #   CP1256                      woe32
 #   CP1257                      woe32
-#   GB2312                  Y   glibc aix hpux irix solaris freebsd darwin
-#   EUC-JP                  Y   glibc aix hpux irix osf solaris freebsd darwin
-#   EUC-KR                  Y   glibc aix hpux irix osf solaris freebsd darwin
-#   EUC-TW                      glibc aix hpux irix osf solaris
-#   BIG5                    Y   glibc aix hpux osf solaris freebsd darwin
+#   GB2312                  Y   glibc aix hpux irix solaris freebsd netbsd darwin
+#   EUC-JP                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin
+#   EUC-KR                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin
+#   EUC-TW                      glibc aix hpux irix osf solaris netbsd
+#   BIG5                    Y   glibc aix hpux osf solaris freebsd netbsd darwin
 #   BIG5-HKSCS                  glibc solaris
 #   GBK                         glibc aix osf solaris woe32 dos
-#   GB18030                     glibc solaris
-#   SHIFT_JIS               Y   hpux osf solaris freebsd darwin
+#   GB18030                     glibc solaris netbsd
+#   SHIFT_JIS               Y   hpux osf solaris freebsd netbsd darwin
 #   JOHAB                       glibc solaris woe32
 #   TIS-620                     glibc aix hpux osf solaris
 #   VISCII                  Y   glibc
@@ -100,7 +100,7 @@
 #   HP-KANA8                    hpux
 #   DEC-KANJI                   osf
 #   DEC-HANYU                   osf
-#   UTF-8                   Y   glibc aix hpux osf solaris
+#   UTF-8                   Y   glibc aix hpux osf solaris netbsd darwin
 #
 # Note: Names which are not marked as being a MIME name should not be used in
 # Internet protocols for information interchange (mail, news, etc.).
@@ -388,6 +388,8 @@ case "$os" in
 	echo "ISO8859-2 ISO-8859-2"
 	echo "ISO8859-4 ISO-8859-4"
 	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-13 ISO-8859-13"
 	echo "ISO8859-15 ISO-8859-15"
 	echo "eucCN GB2312"
 	echo "eucJP EUC-JP"
@@ -396,7 +398,7 @@ case "$os" in
 	echo "BIG5 BIG5"
 	echo "SJIS SHIFT_JIS"
 	;;
-    darwin*)
+    darwin[56]*)
 	# Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
 	# localcharset.c falls back to using the full locale name
 	# from the environment variables.
@@ -437,6 +439,36 @@ case "$os" in
 	echo "ja_JP.SJIS SHIFT_JIS"
 	echo "ko_KR.EUC EUC-KR"
 	;;
+    darwin*)
+	# Darwin 7.5 has nl_langinfo(CODESET), but it is useless:
+	# - It returns the empty string when LANG is set to a locale of the
+	#   form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8
+	#   LC_CTYPE file.
+	# - The environment variables LANG, LC_CTYPE, LC_ALL are not set by
+	#   the system; nl_langinfo(CODESET) returns "US-ASCII" in this case.
+	# - The documentation says:
+	#     "... all code that calls BSD system routines should ensure
+	#      that the const *char parameters of these routines are in UTF-8
+	#      encoding. All BSD system functions expect their string
+	#      parameters to be in UTF-8 encoding and nothing else."
+	#   It also says
+	#     "An additional caveat is that string parameters for files,
+	#      paths, and other file-system entities must be in canonical
+	#      UTF-8. In a canonical UTF-8 Unicode string, all decomposable
+	#      characters are decomposed ..."
+	#   but this is not true: You can pass non-decomposed UTF-8 strings
+	#   to file system functions, and it is the OS which will convert
+	#   them to decomposed UTF-8 before accessing the file system.
+	# - The Apple Terminal application displays UTF-8 by default.
+	# - However, other applications are free to use different encodings:
+	#   - xterm uses ISO-8859-1 by default.
+	#   - TextEdit uses MacRoman by default.
+	# We prefer UTF-8 over decomposed UTF-8-MAC because one should
+	# minimize the use of decomposed Unicode. Unfortunately, through the
+	# Darwin file system, decomposed UTF-8 strings are leaked into user
+	# space nevertheless.
+	echo "* UTF-8"
+	;;
     beos*)
 	# BeOS has a single locale, and it has UTF-8 encoding.
 	echo "* UTF-8"
@@ -450,7 +482,7 @@ case "$os" in
 	echo "# If you find that the encoding given for your language and"
 	echo "# country is not the one your DOS machine actually uses, just"
 	echo "# correct it in this file, and send a mail to"
-	echo "# Juan Manuel Guerrero <[email protected]>"
+	echo "# Juan Manuel Guerrero <[email protected]>"
 	echo "# and Bruno Haible <[email protected]>."
 	echo "#"
 	echo "C ASCII"
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 22b7cd2f6..583976821 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the internal dcigettext function.
-   Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -27,6 +27,9 @@
 # include <config.h>
 #endif
 
+/* NL_LOCALE_NAME does not work in glibc-2.4.  Ignore it.  */
+#undef HAVE_NL_LOCALE_NAME
+
 #include <sys/types.h>
 
 #ifdef __GNUC__
@@ -87,26 +90,31 @@ extern int errno;
 # include <sys/param.h>
 #endif
 
+#if !defined _LIBC && HAVE_NL_LOCALE_NAME
+# include <langinfo.h>
+#endif
+
 #include "gettextP.h"
 #include "plural-exp.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
+# ifdef IN_LIBGLOCALE
+#  include <libintl.h>
+# endif
 # include "libgnuintl.h"
 #endif
 #include "hash-string.h"
 
-/* Thread safetyness.  */
+/* Handle multi-threaded applications.  */
 #ifdef _LIBC
 # include <bits/libc-lock.h>
+# define gl_rwlock_define_initialized __libc_rwlock_define_initialized
+# define gl_rwlock_rdlock __libc_rwlock_rdlock
+# define gl_rwlock_wrlock __libc_rwlock_wrlock
+# define gl_rwlock_unlock __libc_rwlock_unlock
 #else
-/* Provide dummy implementation if this is outside glibc.  */
-# define __libc_lock_define_initialized(CLASS, NAME)
-# define __libc_lock_lock(NAME)
-# define __libc_lock_unlock(NAME)
-# define __libc_rwlock_define_initialized(CLASS, NAME)
-# define __libc_rwlock_rdlock(NAME)
-# define __libc_rwlock_unlock(NAME)
+# include "lock.h"
 #endif
 
 /* Alignment of types.  */
@@ -200,8 +208,8 @@ static void *mempcpy (void *dest, const void *src, size_t n);
                         it may be concatenated to a directory pathname.
    IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
  */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, OS/2, DOS */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 # define HAS_DEVICE(P) \
     ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
@@ -216,16 +224,31 @@ static void *mempcpy (void *dest, const void *src, size_t n);
 # define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
 #endif
 
+/* Whether to support different locales in different threads.  */
+#if defined _LIBC || HAVE_NL_LOCALE_NAME || (HAVE_STRUCT___LOCALE_STRUCT___NAMES && defined USE_IN_GETTEXT_TESTS) || defined IN_LIBGLOCALE
+# define HAVE_PER_THREAD_LOCALE
+#endif
+
 /* This is the type used for the search tree where known translations
    are stored.  */
 struct known_translation_t
 {
   /* Domain in which to search.  */
-  char *domainname;
+  const char *domainname;
 
   /* The category.  */
   int category;
 
+#ifdef HAVE_PER_THREAD_LOCALE
+  /* Name of the relevant locale category, or "" for the global locale.  */
+  const char *localename;
+#endif
+
+#ifdef IN_LIBGLOCALE
+  /* The character encoding.  */
+  const char *encoding;
+#endif
+
   /* State of the catalog counter at the point the string was found.  */
   int counter;
 
@@ -245,6 +268,8 @@ struct known_translation_t
 #if defined HAVE_TSEARCH || defined _LIBC
 # include <search.h>
 
+gl_rwlock_define_initialized (static, tree_lock)
+
 static void *root;
 
 # ifdef _LIBC
@@ -267,57 +292,86 @@ transcmp (const void *p1, const void *p2)
     {
       result = strcmp (s1->domainname, s2->domainname);
       if (result == 0)
-	/* We compare the category last (though this is the cheapest
-	   operation) since it is hopefully always the same (namely
-	   LC_MESSAGES).  */
-	result = s1->category - s2->category;
+	{
+#ifdef HAVE_PER_THREAD_LOCALE
+	  result = strcmp (s1->localename, s2->localename);
+	  if (result == 0)
+#endif
+	    {
+#ifdef IN_LIBGLOCALE
+	      result = strcmp (s1->encoding, s2->encoding);
+	      if (result == 0)
+#endif
+		/* We compare the category last (though this is the cheapest
+		   operation) since it is hopefully always the same (namely
+		   LC_MESSAGES).  */
+		result = s1->category - s2->category;
+	    }
+	}
     }
 
   return result;
 }
 #endif
 
-#ifndef INTVARDEF
-# define INTVARDEF(name)
-#endif
-#ifndef INTUSE
-# define INTUSE(name) name
-#endif
-
 /* Name of the default domain used for gettext(3) prior any call to
    textdomain(3).  The default value for this is "messages".  */
 const char _nl_default_default_domain[] attribute_hidden = "messages";
 
+#ifndef IN_LIBGLOCALE
 /* Value used as the default domain for gettext(3).  */
 const char *_nl_current_default_domain attribute_hidden
      = _nl_default_default_domain;
+#endif
 
 /* Contains the default location of the message catalogs.  */
 #if defined __EMX__
 extern const char _nl_default_dirname[];
 #else
+# ifdef _LIBC
+extern const char _nl_default_dirname[];
+libc_hidden_proto (_nl_default_dirname)
+# endif
 const char _nl_default_dirname[] = LOCALEDIR;
-INTVARDEF (_nl_default_dirname)
+# ifdef _LIBC
+libc_hidden_data_def (_nl_default_dirname)
+# endif
 #endif
 
+#ifndef IN_LIBGLOCALE
 /* List with bindings of specific domains created by bindtextdomain()
    calls.  */
 struct binding *_nl_domain_bindings;
+#endif
 
 /* Prototypes for local functions.  */
 static char *plural_lookup (struct loaded_l10nfile *domain,
 			    unsigned long int n,
 			    const char *translation, size_t translation_len)
      internal_function;
+
+#ifdef IN_LIBGLOCALE
+static const char *guess_category_value (int category,
+					 const char *categoryname,
+					 const char *localename)
+     internal_function;
+#else
 static const char *guess_category_value (int category,
 					 const char *categoryname)
      internal_function;
+#endif
+
 #ifdef _LIBC
 # include "../locale/localeinfo.h"
-# define category_to_name(category)	_nl_category_names[category]
+# define category_to_name(category) \
+  _nl_category_names.str + _nl_category_name_idxs[category]
 #else
 static const char *category_to_name (int category) internal_function;
 #endif
+#if (defined _LIBC || HAVE_ICONV) && !defined IN_LIBGLOCALE
+static const char *get_output_charset (struct binding *domainbinding)
+     internal_function;
+#endif
 
 
 /* For those loosing systems which don't have `alloca' we have to add
@@ -383,9 +437,7 @@ typedef unsigned char transmem_block_t;
 #endif
 
 /* Lock variable to protect the global data in the gettext implementation.  */
-#ifdef _LIBC
-__libc_rwlock_define_initialized (, _nl_state_lock attribute_hidden)
-#endif
+gl_rwlock_define_initialized (, _nl_state_lock attribute_hidden)
 
 /* Checking whether the binaries runs SUID must be done and glibc provides
    easier methods therefore we make a difference here.  */
@@ -423,9 +475,18 @@ static int enable_secure;
 /* Look up MSGID in the DOMAINNAME message catalog for the current
    CATEGORY locale and, if PLURAL is nonzero, search over string
    depending on the plural form determined by N.  */
+#ifdef IN_LIBGLOCALE
+char *
+gl_dcigettext (const char *domainname,
+	       const char *msgid1, const char *msgid2,
+	       int plural, unsigned long int n,
+	       int category,
+	       const char *localename, const char *encoding)
+#else
 char *
 DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
 	    int plural, unsigned long int n, int category)
+#endif
 {
 #ifndef HAVE_ALLOCA
   struct block_list *block_list = NULL;
@@ -434,7 +495,8 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
   struct binding *binding;
   const char *categoryname;
   const char *categoryvalue;
-  char *dirname, *xdomainname;
+  const char *dirname;
+  char *xdomainname;
   char *single_locale;
   char *retval;
   size_t retlen;
@@ -443,6 +505,9 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
   struct known_translation_t *search;
   struct known_translation_t **foundp = NULL;
   size_t msgid_len;
+# if defined HAVE_PER_THREAD_LOCALE && !defined IN_LIBGLOCALE
+  const char *localename;
+# endif
 #endif
   size_t domainname_len;
 
@@ -459,7 +524,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
 	    : n == 1 ? (char *) msgid1 : (char *) msgid2);
 #endif
 
-  __libc_rwlock_rdlock (_nl_state_lock);
+  gl_rwlock_rdlock (_nl_state_lock);
 
   /* If DOMAINNAME is NULL, we are interested in the default domain.  If
      CATEGORY is not LC_MESSAGES this might not make much sense but the
@@ -481,10 +546,45 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
   search = (struct known_translation_t *)
 	   alloca (offsetof (struct known_translation_t, msgid) + msgid_len);
   memcpy (search->msgid, msgid1, msgid_len);
-  search->domainname = (char *) domainname;
+  search->domainname = domainname;
   search->category = category;
+# ifdef HAVE_PER_THREAD_LOCALE
+#  ifndef IN_LIBGLOCALE
+#   ifdef _LIBC
+  localename = __current_locale_name (category);
+#   else
+#    if HAVE_NL_LOCALE_NAME
+  /* NL_LOCALE_NAME is public glibc API introduced in glibc-2.4.  */
+  localename = nl_langinfo (NL_LOCALE_NAME (category));
+#    else
+#     if HAVE_STRUCT___LOCALE_STRUCT___NAMES && defined USE_IN_GETTEXT_TESTS
+  /* The __names field is not public glibc API and must therefore not be used
+     in code that is installed in public locations.  */
+  {
+    locale_t thread_locale = uselocale (NULL);
+    if (thread_locale != LC_GLOBAL_LOCALE)
+      localename = thread_locale->__names[category];
+    else
+      localename = "";
+  }
+#     endif
+#    endif
+#   endif
+#  endif
+  search->localename = localename;
+#  ifdef IN_LIBGLOCALE
+  search->encoding = encoding;
+#  endif
+# endif
+
+  /* Since tfind/tsearch manage a balanced tree, concurrent tfind and
+     tsearch calls can be fatal.  */
+  gl_rwlock_rdlock (tree_lock);
 
   foundp = (struct known_translation_t **) tfind (search, &root, transcmp);
+
+  gl_rwlock_unlock (tree_lock);
+
   freea (search);
   if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
     {
@@ -495,7 +595,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
       else
 	retval = (char *) (*foundp)->translation;
 
-      __libc_rwlock_unlock (_nl_state_lock);
+      gl_rwlock_unlock (_nl_state_lock);
       return retval;
     }
 #endif
@@ -507,6 +607,12 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
   DETERMINE_SECURE;
 
   /* First find matching binding.  */
+#ifdef IN_LIBGLOCALE
+  /* We can use a trivial binding, since _nl_find_msg will ignore it anyway,
+     and _nl_load_domain and _nl_find_domain just pass it through.  */
+  binding = NULL;
+  dirname = bindtextdomain (domainname, NULL);
+#else
   for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
     {
       int compare = strcmp (domainname, binding->domainname);
@@ -522,44 +628,55 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
     }
 
   if (binding == NULL)
-    dirname = (char *) INTUSE(_nl_default_dirname);
-  else if (IS_ABSOLUTE_PATH (binding->dirname))
-    dirname = binding->dirname;
+    dirname = _nl_default_dirname;
   else
     {
-      /* We have a relative path.  Make it absolute now.  */
-      size_t dirname_len = strlen (binding->dirname) + 1;
-      size_t path_max;
-      char *ret;
+      dirname = binding->dirname;
+#endif
+      if (!IS_ABSOLUTE_PATH (dirname))
+	{
+	  /* We have a relative path.  Make it absolute now.  */
+	  size_t dirname_len = strlen (dirname) + 1;
+	  size_t path_max;
+	  char *resolved_dirname;
+	  char *ret;
 
-      path_max = (unsigned int) PATH_MAX;
-      path_max += 2;		/* The getcwd docs say to do this.  */
+	  path_max = (unsigned int) PATH_MAX;
+	  path_max += 2;		/* The getcwd docs say to do this.  */
 
-      for (;;)
-	{
-	  dirname = (char *) alloca (path_max + dirname_len);
-	  ADD_BLOCK (block_list, dirname);
+	  for (;;)
+	    {
+	      resolved_dirname = (char *) alloca (path_max + dirname_len);
+	      ADD_BLOCK (block_list, tmp_dirname);
 
-	  __set_errno (0);
-	  ret = getcwd (dirname, path_max);
-	  if (ret != NULL || errno != ERANGE)
-	    break;
+	      __set_errno (0);
+	      ret = getcwd (resolved_dirname, path_max);
+	      if (ret != NULL || errno != ERANGE)
+		break;
 
-	  path_max += path_max / 2;
-	  path_max += PATH_INCR;
-	}
+	      path_max += path_max / 2;
+	      path_max += PATH_INCR;
+	    }
 
-      if (ret == NULL)
-	/* We cannot get the current working directory.  Don't signal an
-	   error but simply return the default string.  */
-	goto return_untranslated;
+	  if (ret == NULL)
+	    /* We cannot get the current working directory.  Don't signal an
+	       error but simply return the default string.  */
+	    goto return_untranslated;
 
-      stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
+	  stpcpy (stpcpy (strchr (resolved_dirname, '\0'), "/"), dirname);
+	  dirname = resolved_dirname;
+	}
+#ifndef IN_LIBGLOCALE
     }
+#endif
 
   /* Now determine the symbolic name of CATEGORY and its value.  */
   categoryname = category_to_name (category);
+#ifdef IN_LIBGLOCALE
+  categoryvalue = guess_category_value (category, categoryname, localename);
+#else
   categoryvalue = guess_category_value (category, categoryname);
+#endif
 
   domainname_len = strlen (domainname);
   xdomainname = (char *) alloca (strlen (categoryname)
@@ -617,7 +734,11 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
 
       if (domain != NULL)
 	{
-	  retval = _nl_find_msg (domain, binding, msgid1, &retlen);
+#if defined IN_LIBGLOCALE
+	  retval = _nl_find_msg (domain, binding, encoding, msgid1, &retlen);
+#else
+	  retval = _nl_find_msg (domain, binding, msgid1, 1, &retlen);
+#endif
 
 	  if (retval == NULL)
 	    {
@@ -625,8 +746,13 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
 
 	      for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
 		{
+#if defined IN_LIBGLOCALE
+		  retval = _nl_find_msg (domain->successor[cnt], binding,
+					 encoding, msgid1, &retlen);
+#else
 		  retval = _nl_find_msg (domain->successor[cnt], binding,
-					 msgid1, &retlen);
+					 msgid1, 1, &retlen);
+#endif
 
 		  if (retval != NULL)
 		    {
@@ -636,6 +762,12 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
 		}
 	    }
 
+	  /* Returning -1 means that some resource problem exists
+	     (likely memory) and that the strings could not be
+	     converted.  Return the original strings.  */
+	  if (__builtin_expect (retval == (char *) -1, 0))
+	    break;
+
 	  if (retval != NULL)
 	    {
 	      /* Found the translation of MSGID1 in domain DOMAIN:
@@ -645,25 +777,49 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
 	      if (foundp == NULL)
 		{
 		  /* Create a new entry and add it to the search tree.  */
+		  size_t size;
 		  struct known_translation_t *newp;
 
-		  newp = (struct known_translation_t *)
-		    malloc (offsetof (struct known_translation_t, msgid)
-			    + msgid_len + domainname_len + 1);
+		  size = offsetof (struct known_translation_t, msgid)
+			 + msgid_len + domainname_len + 1;
+# ifdef HAVE_PER_THREAD_LOCALE
+		  size += strlen (localename) + 1;
+# endif
+		  newp = (struct known_translation_t *) malloc (size);
 		  if (newp != NULL)
 		    {
-		      newp->domainname =
-			mempcpy (newp->msgid, msgid1, msgid_len);
-		      memcpy (newp->domainname, domainname, domainname_len + 1);
+		      char *new_domainname;
+# ifdef HAVE_PER_THREAD_LOCALE
+		      char *new_localename;
+# endif
+
+		      new_domainname = mempcpy (newp->msgid, msgid1, msgid_len);
+		      memcpy (new_domainname, domainname, domainname_len + 1);
+# ifdef HAVE_PER_THREAD_LOCALE
+		      new_localename = new_domainname + domainname_len + 1;
+		      strcpy (new_localename, localename);
+# endif
+		      newp->domainname = new_domainname;
 		      newp->category = category;
+# ifdef HAVE_PER_THREAD_LOCALE
+		      newp->localename = new_localename;
+# endif
+# ifdef IN_LIBGLOCALE
+		      newp->encoding = encoding;
+# endif
 		      newp->counter = _nl_msg_cat_cntr;
 		      newp->domain = domain;
 		      newp->translation = retval;
 		      newp->translation_length = retlen;
 
+		      gl_rwlock_wrlock (tree_lock);
+
 		      /* Insert the entry in the search tree.  */
 		      foundp = (struct known_translation_t **)
 			tsearch (newp, &root, transcmp);
+
+		      gl_rwlock_unlock (tree_lock);
+
 		      if (foundp == NULL
 			  || __builtin_expect (*foundp != newp, 0))
 			/* The insert failed.  */
@@ -685,7 +841,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
 	      if (plural)
 		retval = plural_lookup (domain, n, retval, retlen);
 
-	      __libc_rwlock_unlock (_nl_state_lock);
+	      gl_rwlock_unlock (_nl_state_lock);
 	      return retval;
 	    }
 	}
@@ -694,7 +850,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
  return_untranslated:
   /* Return the untranslated MSGID.  */
   FREE_BLOCKS (block_list);
-  __libc_rwlock_unlock (_nl_state_lock);
+  gl_rwlock_unlock (_nl_state_lock);
 #ifndef _LIBC
   if (!ENABLE_SECURE)
     {
@@ -716,11 +872,24 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
 }
 
 
+/* Look up the translation of msgid within DOMAIN_FILE and DOMAINBINDING.
+   Return it if found.  Return NULL if not found or in case of a conversion
+   failure (problem in the particular message catalog).  Return (char *) -1
+   in case of a memory allocation failure during conversion (only if
+   ENCODING != NULL resp. CONVERT == true).  */
 char *
 internal_function
+#ifdef IN_LIBGLOCALE
 _nl_find_msg (struct loaded_l10nfile *domain_file,
-	      struct binding *domainbinding, const char *msgid,
+	      struct binding *domainbinding, const char *encoding,
+	      const char *msgid,
 	      size_t *lengthp)
+#else
+_nl_find_msg (struct loaded_l10nfile *domain_file,
+	      struct binding *domainbinding,
+	      const char *msgid, int convert,
+	      size_t *lengthp)
+#endif
 {
   struct loaded_domain *domain;
   nls_uint32 nstrings;
@@ -728,7 +897,7 @@ _nl_find_msg (struct loaded_l10nfile *domain_file,
   char *result;
   size_t resultlen;
 
-  if (domain_file->decided == 0)
+  if (domain_file->decided <= 0)
     _nl_load_domain (domain_file, domainbinding);
 
   if (domain_file->data == NULL)
@@ -743,7 +912,7 @@ _nl_find_msg (struct loaded_l10nfile *domain_file,
     {
       /* Use the hashing table.  */
       nls_uint32 len = strlen (msgid);
-      nls_uint32 hash_val = hash_string (msgid);
+      nls_uint32 hash_val = __hash_string (msgid);
       nls_uint32 idx = hash_val % domain->hash_size;
       nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
 
@@ -826,195 +995,345 @@ _nl_find_msg (struct loaded_l10nfile *domain_file,
     }
 
 #if defined _LIBC || HAVE_ICONV
-  if (domain->codeset_cntr
-      != (domainbinding != NULL ? domainbinding->codeset_cntr : 0))
+# ifdef IN_LIBGLOCALE
+  if (encoding != NULL)
+# else
+  if (convert)
+# endif
     {
-      /* The domain's codeset has changed through bind_textdomain_codeset()
-	 since the message catalog was initialized or last accessed.  We
-	 have to reinitialize the converter.  */
-      _nl_free_domain_conv (domain);
-      _nl_init_domain_conv (domain_file, domain, domainbinding);
-    }
+      /* We are supposed to do a conversion.  */
+# ifndef IN_LIBGLOCALE
+      const char *encoding = get_output_charset (domainbinding);
+# endif
+
+      /* Search whether a table with converted translations for this
+	 encoding has already been allocated.  */
+      size_t nconversions = domain->nconversions;
+      struct converted_domain *convd = NULL;
+      size_t i;
+
+      for (i = nconversions; i > 0; )
+	{
+	  i--;
+	  if (strcmp (domain->conversions[i].encoding, encoding) == 0)
+	    {
+	      convd = &domain->conversions[i];
+	      break;
+	    }
+	}
 
-  if (
+      if (convd == NULL)
+	{
+	  /* Allocate a table for the converted translations for this
+	     encoding.  */
+	  struct converted_domain *new_conversions =
+	    (struct converted_domain *)
+	    (domain->conversions != NULL
+	     ? realloc (domain->conversions,
+			(nconversions + 1) * sizeof (struct converted_domain))
+	     : malloc ((nconversions + 1) * sizeof (struct converted_domain)));
+
+	  if (__builtin_expect (new_conversions == NULL, 0))
+	    /* Nothing we can do, no more memory.  We cannot use the
+	       translation because it might be encoded incorrectly.  */
+	    return (char *) -1;
+
+	  domain->conversions = new_conversions;
+
+	  /* Copy the 'encoding' string to permanent storage.  */
+	  encoding = strdup (encoding);
+	  if (__builtin_expect (encoding == NULL, 0))
+	    /* Nothing we can do, no more memory.  We cannot use the
+	       translation because it might be encoded incorrectly.  */
+	    return (char *) -1;
+
+	  convd = &new_conversions[nconversions];
+	  convd->encoding = encoding;
+
+	  /* Find out about the character set the file is encoded with.
+	     This can be found (in textual form) in the entry "".  If this
+	     entry does not exist or if this does not contain the 'charset='
+	     information, we will assume the charset matches the one the
+	     current locale and we don't have to perform any conversion.  */
 # ifdef _LIBC
-      domain->conv != (__gconv_t) -1
+	  convd->conv = (__gconv_t) -1;
 # else
 #  if HAVE_ICONV
-      domain->conv != (iconv_t) -1
+	  convd->conv = (iconv_t) -1;
 #  endif
 # endif
-      )
-    {
-      /* We are supposed to do a conversion.  First allocate an
-	 appropriate table with the same structure as the table
-	 of translations in the file, where we can put the pointers
-	 to the converted strings in.
-	 There is a slight complication with plural entries.  They
-	 are represented by consecutive NUL terminated strings.  We
-	 handle this case by converting RESULTLEN bytes, including
-	 NULs.  */
-
-      if (domain->conv_tab == NULL
-	  && ((domain->conv_tab =
-		 (char **) calloc (nstrings + domain->n_sysdep_strings,
-				   sizeof (char *)))
-	      == NULL))
-	/* Mark that we didn't succeed allocating a table.  */
-	domain->conv_tab = (char **) -1;
-
-      if (__builtin_expect (domain->conv_tab == (char **) -1, 0))
-	/* Nothing we can do, no more memory.  */
-	goto converted;
-
-      if (domain->conv_tab[act] == NULL)
+	  {
+	    char *nullentry;
+	    size_t nullentrylen;
+
+	    /* Get the header entry.  This is a recursion, but it doesn't
+	       reallocate domain->conversions because we pass
+	       encoding = NULL or convert = 0, respectively.  */
+	    nullentry =
+# ifdef IN_LIBGLOCALE
+	      _nl_find_msg (domain_file, domainbinding, NULL, "",
+			    &nullentrylen);
+# else
+	      _nl_find_msg (domain_file, domainbinding, "", 0, &nullentrylen);
+# endif
+
+	    if (nullentry != NULL)
+	      {
+		const char *charsetstr;
+
+		charsetstr = strstr (nullentry, "charset=");
+		if (charsetstr != NULL)
+		  {
+		    size_t len;
+		    char *charset;
+		    const char *outcharset;
+
+		    charsetstr += strlen ("charset=");
+		    len = strcspn (charsetstr, " \t\n");
+
+		    charset = (char *) alloca (len + 1);
+# if defined _LIBC || HAVE_MEMPCPY
+		    *((char *) mempcpy (charset, charsetstr, len)) = '\0';
+# else
+		    memcpy (charset, charsetstr, len);
+		    charset[len] = '\0';
+# endif
+
+		    outcharset = encoding;
+
+# ifdef _LIBC
+		    /* We always want to use transliteration.  */
+		    outcharset = norm_add_slashes (outcharset, "TRANSLIT");
+		    charset = norm_add_slashes (charset, "");
+		    int r = __gconv_open (outcharset, charset, &convd->conv,
+					  GCONV_AVOID_NOCONV);
+		    if (__builtin_expect (r != __GCONV_OK, 0))
+		      {
+			/* If the output encoding is the same there is
+			   nothing to do.  Otherwise do not use the
+			   translation at all.  */
+			if (__builtin_expect (r != __GCONV_NOCONV, 1))
+			  return NULL;
+
+			convd->conv = (__gconv_t) -1;
+		      }
+# else
+#  if HAVE_ICONV
+		    /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
+		       we want to use transliteration.  */
+#   if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
+       || _LIBICONV_VERSION >= 0x0105
+		    if (strchr (outcharset, '/') == NULL)
+		      {
+			char *tmp;
+
+			len = strlen (outcharset);
+			tmp = (char *) alloca (len + 10 + 1);
+			memcpy (tmp, outcharset, len);
+			memcpy (tmp + len, "//TRANSLIT", 10 + 1);
+			outcharset = tmp;
+
+			convd->conv = iconv_open (outcharset, charset);
+
+			freea (outcharset);
+		      }
+		    else
+#   endif
+		      convd->conv = iconv_open (outcharset, charset);
+#  endif
+# endif
+
+		    freea (charset);
+		  }
+	      }
+	  }
+	  convd->conv_tab = NULL;
+	  /* Here domain->conversions is still == new_conversions.  */
+	  domain->nconversions++;
+	}
+
+      if (
+# ifdef _LIBC
+	  convd->conv != (__gconv_t) -1
+# else
+#  if HAVE_ICONV
+	  convd->conv != (iconv_t) -1
+#  endif
+# endif
+	  )
 	{
-	  /* We haven't used this string so far, so it is not
-	     translated yet.  Do this now.  */
-	  /* We use a bit more efficient memory handling.
-	     We allocate always larger blocks which get used over
-	     time.  This is faster than many small allocations.   */
-	  __libc_lock_define_initialized (static, lock)
+	  /* We are supposed to do a conversion.  First allocate an
+	     appropriate table with the same structure as the table
+	     of translations in the file, where we can put the pointers
+	     to the converted strings in.
+	     There is a slight complication with plural entries.  They
+	     are represented by consecutive NUL terminated strings.  We
+	     handle this case by converting RESULTLEN bytes, including
+	     NULs.  */
+
+	  if (convd->conv_tab == NULL
+	      && ((convd->conv_tab =
+		    (char **) calloc (nstrings + domain->n_sysdep_strings,
+				      sizeof (char *)))
+		  == NULL))
+	    /* Mark that we didn't succeed allocating a table.  */
+	    convd->conv_tab = (char **) -1;
+
+	  if (__builtin_expect (convd->conv_tab == (char **) -1, 0))
+	    /* Nothing we can do, no more memory.  We cannot use the
+	       translation because it might be encoded incorrectly.  */
+	    return (char *) -1;
+
+	  if (convd->conv_tab[act] == NULL)
+	    {
+	      /* We haven't used this string so far, so it is not
+		 translated yet.  Do this now.  */
+	      /* We use a bit more efficient memory handling.
+		 We allocate always larger blocks which get used over
+		 time.  This is faster than many small allocations.   */
+	      __libc_lock_define_initialized (static, lock)
 # define INITIAL_BLOCK_SIZE	4080
-	  static unsigned char *freemem;
-	  static size_t freemem_size;
+	      static unsigned char *freemem;
+	      static size_t freemem_size;
 
-	  const unsigned char *inbuf;
-	  unsigned char *outbuf;
-	  int malloc_count;
+	      const unsigned char *inbuf;
+	      unsigned char *outbuf;
+	      int malloc_count;
 # ifndef _LIBC
-	  transmem_block_t *transmem_list = NULL;
+	      transmem_block_t *transmem_list = NULL;
 # endif
 
-	  __libc_lock_lock (lock);
+	      __libc_lock_lock (lock);
 
-	  inbuf = (const unsigned char *) result;
-	  outbuf = freemem + sizeof (size_t);
+	      inbuf = (const unsigned char *) result;
+	      outbuf = freemem + sizeof (size_t);
 
-	  malloc_count = 0;
-	  while (1)
-	    {
-	      transmem_block_t *newmem;
+	      malloc_count = 0;
+	      while (1)
+		{
+		  transmem_block_t *newmem;
 # ifdef _LIBC
-	      size_t non_reversible;
-	      int res;
+		  size_t non_reversible;
+		  int res;
 
-	      if (freemem_size < sizeof (size_t))
-		goto resize_freemem;
+		  if (freemem_size < sizeof (size_t))
+		    goto resize_freemem;
 
-	      res = __gconv (domain->conv,
-			     &inbuf, inbuf + resultlen,
-			     &outbuf,
-			     outbuf + freemem_size - sizeof (size_t),
-			     &non_reversible);
+		  res = __gconv (convd->conv,
+				 &inbuf, inbuf + resultlen,
+				 &outbuf,
+				 outbuf + freemem_size - sizeof (size_t),
+				 &non_reversible);
 
-	      if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT)
-		break;
+		  if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT)
+		    break;
 
-	      if (res != __GCONV_FULL_OUTPUT)
-		{
-		  __libc_lock_unlock (lock);
-		  goto converted;
-		}
+		  if (res != __GCONV_FULL_OUTPUT)
+		    {
+		      /* We should not use the translation at all, it
+			 is incorrectly encoded.  */
+		      __libc_lock_unlock (lock);
+		      return NULL;
+		    }
 
-	      inbuf = result;
+		  inbuf = (const unsigned char *) result;
 # else
 #  if HAVE_ICONV
-	      const char *inptr = (const char *) inbuf;
-	      size_t inleft = resultlen;
-	      char *outptr = (char *) outbuf;
-	      size_t outleft;
-
-	      if (freemem_size < sizeof (size_t))
-		goto resize_freemem;
-
-	      outleft = freemem_size - sizeof (size_t);
-	      if (iconv (domain->conv,
-			 (ICONV_CONST char **) &inptr, &inleft,
-			 &outptr, &outleft)
-		  != (size_t) (-1))
-		{
-		  outbuf = (unsigned char *) outptr;
-		  break;
-		}
-	      if (errno != E2BIG)
-		{
-		  __libc_lock_unlock (lock);
-		  goto converted;
-		}
+		  const char *inptr = (const char *) inbuf;
+		  size_t inleft = resultlen;
+		  char *outptr = (char *) outbuf;
+		  size_t outleft;
+
+		  if (freemem_size < sizeof (size_t))
+		    goto resize_freemem;
+
+		  outleft = freemem_size - sizeof (size_t);
+		  if (iconv (convd->conv,
+			     (ICONV_CONST char **) &inptr, &inleft,
+			     &outptr, &outleft)
+		      != (size_t) (-1))
+		    {
+		      outbuf = (unsigned char *) outptr;
+		      break;
+		    }
+		  if (errno != E2BIG)
+		    {
+		      __libc_lock_unlock (lock);
+		      return NULL;
+		    }
 #  endif
 # endif
 
-	    resize_freemem:
-	      /* We must allocate a new buffer or resize the old one.  */
-	      if (malloc_count > 0)
-		{
-		  ++malloc_count;
-		  freemem_size = malloc_count * INITIAL_BLOCK_SIZE;
-		  newmem = (transmem_block_t *) realloc (transmem_list,
-							 freemem_size);
+		resize_freemem:
+		  /* We must allocate a new buffer or resize the old one.  */
+		  if (malloc_count > 0)
+		    {
+		      ++malloc_count;
+		      freemem_size = malloc_count * INITIAL_BLOCK_SIZE;
+		      newmem = (transmem_block_t *) realloc (transmem_list,
+							     freemem_size);
 # ifdef _LIBC
-		  if (newmem != NULL)
-		    transmem_list = transmem_list->next;
+		      if (newmem != NULL)
+			transmem_list = transmem_list->next;
+		      else
+			{
+			  struct transmem_list *old = transmem_list;
+
+			  transmem_list = transmem_list->next;
+			  free (old);
+			}
+# endif
+		    }
 		  else
 		    {
-		      struct transmem_list *old = transmem_list;
-
-		      transmem_list = transmem_list->next;
-		      free (old);
+		      malloc_count = 1;
+		      freemem_size = INITIAL_BLOCK_SIZE;
+		      newmem = (transmem_block_t *) malloc (freemem_size);
+		    }
+		  if (__builtin_expect (newmem == NULL, 0))
+		    {
+		      freemem = NULL;
+		      freemem_size = 0;
+		      __libc_lock_unlock (lock);
+		      return (char *) -1;
 		    }
-# endif
-		}
-	      else
-		{
-		  malloc_count = 1;
-		  freemem_size = INITIAL_BLOCK_SIZE;
-		  newmem = (transmem_block_t *) malloc (freemem_size);
-		}
-	      if (__builtin_expect (newmem == NULL, 0))
-		{
-		  freemem = NULL;
-		  freemem_size = 0;
-		  __libc_lock_unlock (lock);
-		  goto converted;
-		}
 
 # ifdef _LIBC
-	      /* Add the block to the list of blocks we have to free
-                 at some point.  */
-	      newmem->next = transmem_list;
-	      transmem_list = newmem;
+		  /* Add the block to the list of blocks we have to free
+		     at some point.  */
+		  newmem->next = transmem_list;
+		  transmem_list = newmem;
 
-	      freemem = newmem->data;
-	      freemem_size -= offsetof (struct transmem_list, data);
+		  freemem = (unsigned char *) newmem->data;
+		  freemem_size -= offsetof (struct transmem_list, data);
 # else
-	      transmem_list = newmem;
-	      freemem = newmem;
+		  transmem_list = newmem;
+		  freemem = newmem;
 # endif
 
-	      outbuf = freemem + sizeof (size_t);
+		  outbuf = freemem + sizeof (size_t);
+		}
+
+	      /* We have now in our buffer a converted string.  Put this
+		 into the table of conversions.  */
+	      *(size_t *) freemem = outbuf - freemem - sizeof (size_t);
+	      convd->conv_tab[act] = (char *) freemem;
+	      /* Shrink freemem, but keep it aligned.  */
+	      freemem_size -= outbuf - freemem;
+	      freemem = outbuf;
+	      freemem += freemem_size & (alignof (size_t) - 1);
+	      freemem_size = freemem_size & ~ (alignof (size_t) - 1);
+
+	      __libc_lock_unlock (lock);
 	    }
 
-	  /* We have now in our buffer a converted string.  Put this
-	     into the table of conversions.  */
-	  *(size_t *) freemem = outbuf - freemem - sizeof (size_t);
-	  domain->conv_tab[act] = (char *) freemem;
-	  /* Shrink freemem, but keep it aligned.  */
-	  freemem_size -= outbuf - freemem;
-	  freemem = outbuf;
-	  freemem += freemem_size & (alignof (size_t) - 1);
-	  freemem_size = freemem_size & ~ (alignof (size_t) - 1);
-
-	  __libc_lock_unlock (lock);
+	  /* Now convd->conv_tab[act] contains the translation of all
+	     the plural variants.  */
+	  result = convd->conv_tab[act] + sizeof (size_t);
+	  resultlen = *(size_t *) convd->conv_tab[act];
 	}
-
-      /* Now domain->conv_tab[act] contains the translation of all
-	 the plural variants.  */
-      result = domain->conv_tab[act] + sizeof (size_t);
-      resultlen = *(size_t *) domain->conv_tab[act];
     }
 
- converted:
   /* The result string is converted.  */
 
 #endif /* _LIBC || HAVE_ICONV */
@@ -1122,31 +1441,73 @@ category_to_name (int category)
 }
 #endif
 
-/* Guess value of current locale from value of the environment variables.  */
+/* Guess value of current locale from value of the environment variables
+   or system-dependent defaults.  */
 static const char *
 internal_function
+#ifdef IN_LIBGLOCALE
+guess_category_value (int category, const char *categoryname,
+		      const char *locale)
+
+#else
 guess_category_value (int category, const char *categoryname)
+#endif
 {
   const char *language;
-  const char *retval;
-
-  /* The highest priority value is the `LANGUAGE' environment
-     variable.  But we don't use the value if the currently selected
-     locale is the C locale.  This is a GNU extension.  */
-  language = getenv ("LANGUAGE");
-  if (language != NULL && language[0] == '\0')
-    language = NULL;
+#ifndef IN_LIBGLOCALE
+  const char *locale;
+# ifndef _LIBC
+  const char *language_default;
+  int locale_defaulted;
+# endif
+#endif
 
-  /* We have to proceed with the POSIX methods of looking to `LC_ALL',
+  /* We use the settings in the following order:
+     1. The value of the environment variable 'LANGUAGE'.  This is a GNU
+        extension.  Its value can be a colon-separated list of locale names.
+     2. The value of the environment variable 'LC_ALL', 'LC_xxx', or 'LANG'.
+        More precisely, the first among these that is set to a non-empty value.
+        This is how POSIX specifies it.  The value is a single locale name.
+     3. A system-dependent preference list of languages.  Its value can be a
+        colon-separated list of locale names.
+     4. A system-dependent default locale name.
+     This way:
+       - System-dependent settings can be overridden by environment variables.
+       - If the system provides both a list of languages and a default locale,
+         the former is used.  */
+
+#ifndef IN_LIBGLOCALE
+  /* Fetch the locale name, through the POSIX method of looking to `LC_ALL',
      `LC_xxx', and `LANG'.  On some systems this can be done by the
      `setlocale' function itself.  */
-#ifdef _LIBC
-  retval = __current_locale_name (category);
-#else
-  retval = _nl_locale_name (category, categoryname);
+# ifdef _LIBC
+  locale = __current_locale_name (category);
+# else
+#  if HAVE_STRUCT___LOCALE_STRUCT___NAMES && defined USE_IN_GETTEXT_TESTS
+  /* The __names field is not public glibc API and must therefore not be used
+     in code that is installed in public locations.  */
+  locale_t thread_locale = uselocale (NULL);
+  if (thread_locale != LC_GLOBAL_LOCALE)
+    {
+      locale = thread_locale->__names[category];
+      locale_defaulted = 0;
+    }
+  else
+#  endif
+    {
+      locale = _nl_locale_name_posix (category, categoryname);
+      locale_defaulted = 0;
+      if (locale == NULL)
+	{
+	  locale = _nl_locale_name_default ();
+	  locale_defaulted = 1;
+	}
+    }
+# endif
 #endif
 
-  /* Ignore LANGUAGE if the locale is set to "C" because
+  /* Ignore LANGUAGE and its system-dependent analogon if the locale is set
+     to "C" because
      1. "C" locale usually uses the ASCII encoding, and most international
 	messages use non-ASCII characters. These characters get displayed
 	as question marks (if using glibc's iconv()) or as invalid 8-bit
@@ -1154,9 +1515,83 @@ guess_category_value (int category, const char *categoryname)
 	characters to ASCII). In any case, the output is ugly.
      2. The precise output of some programs in the "C" locale is specified
 	by POSIX and should not depend on environment variables like
-	"LANGUAGE".  We allow such programs to use gettext().  */
-  return language != NULL && strcmp (retval, "C") != 0 ? language : retval;
+	"LANGUAGE" or system-dependent information.  We allow such programs
+        to use gettext().  */
+  if (strcmp (locale, "C") == 0)
+    return locale;
+
+  /* The highest priority value is the value of the 'LANGUAGE' environment
+     variable.  */
+  language = getenv ("LANGUAGE");
+  if (language != NULL && language[0] != '\0')
+    return language;
+#if !defined IN_LIBGLOCALE && !defined _LIBC
+  /* The next priority value is the locale name, if not defaulted.  */
+  if (locale_defaulted)
+    {
+      /* The next priority value is the default language preferences list. */
+      language_default = _nl_language_preferences_default ();
+      if (language_default != NULL)
+        return language_default;
+    }
+  /* The least priority value is the locale name, if defaulted.  */
+#endif
+  return locale;
+}
+
+#if (defined _LIBC || HAVE_ICONV) && !defined IN_LIBGLOCALE
+/* Returns the output charset.  */
+static const char *
+internal_function
+get_output_charset (struct binding *domainbinding)
+{
+  /* The output charset should normally be determined by the locale.  But
+     sometimes the locale is not used or not correctly set up, so we provide
+     a possibility for the user to override this: the OUTPUT_CHARSET
+     environment variable.  Moreover, the value specified through
+     bind_textdomain_codeset overrides both.  */
+  if (domainbinding != NULL && domainbinding->codeset != NULL)
+    return domainbinding->codeset;
+  else
+    {
+      /* For speed reasons, we look at the value of OUTPUT_CHARSET only
+	 once.  This is a user variable that is not supposed to change
+	 during a program run.  */
+      static char *output_charset_cache;
+      static int output_charset_cached;
+
+      if (!output_charset_cached)
+	{
+	  const char *value = getenv ("OUTPUT_CHARSET");
+
+	  if (value != NULL && value[0] != '\0')
+	    {
+	      size_t len = strlen (value) + 1;
+	      char *value_copy = (char *) malloc (len);
+
+	      if (value_copy != NULL)
+		memcpy (value_copy, value, len);
+	      output_charset_cache = value_copy;
+	    }
+	  output_charset_cached = 1;
+	}
+
+      if (output_charset_cache != NULL)
+	return output_charset_cache;
+      else
+	{
+# ifdef _LIBC
+	  return _NL_CURRENT (LC_CTYPE, CODESET);
+# else
+#  if HAVE_ICONV
+	  extern const char *locale_charset (void);
+	  return locale_charset ();
+#  endif
+# endif
+	}
+    }
 }
+#endif
 
 /* @@ begin of epilog @@ */
 
@@ -1194,7 +1629,7 @@ libc_freeres_fn (free_mem)
     {
       struct binding *oldp = _nl_domain_bindings;
       _nl_domain_bindings = _nl_domain_bindings->next;
-      if (oldp->dirname != INTUSE(_nl_default_dirname))
+      if (oldp->dirname != _nl_default_dirname)
 	/* Yes, this is a pointer comparison.  */
 	free (oldp->dirname);
       free (oldp->codeset);
diff --git a/intl/explodename.c b/intl/explodename.c
index 1361418df..8d3e1463d 100644
--- a/intl/explodename.c
+++ b/intl/explodename.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1998, 2000-2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1998, 2000-2001, 2003, 2005 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <[email protected]>, 1995.
 
    This program is free software; you can redistribute it and/or modify it
@@ -37,11 +37,15 @@
 
 /* @@ end of prolog @@ */
 
-char *
+/* Split a locale name NAME into a leading language part and all the
+   rest.  Return a pointer to the first character after the language,
+   i.e. to the first byte of the rest.  */
+static char *_nl_find_language (const char *name);
+
+static char *
 _nl_find_language (const char *name)
 {
-  while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
-	 && name[0] != '+' && name[0] != ',')
+  while (name[0] != '\0' && name[0] != '_' && name[0] != '@' && name[0] != '.')
     ++name;
 
   return (char *) name;
@@ -52,10 +56,8 @@ int
 _nl_explode_name (char *name,
 		  const char **language, const char **modifier,
 		  const char **territory, const char **codeset,
-		  const char **normalized_codeset, const char **special,
-		  const char **sponsor, const char **revision)
+		  const char **normalized_codeset)
 {
-  enum { undecided, xpg, cen } syntax;
   char *cp;
   int mask;
 
@@ -63,15 +65,10 @@ _nl_explode_name (char *name,
   *territory = NULL;
   *codeset = NULL;
   *normalized_codeset = NULL;
-  *special = NULL;
-  *sponsor = NULL;
-  *revision = NULL;
 
   /* Now we determine the single parts of the locale name.  First
-     look for the language.  Termination symbols are `_' and `@' if
-     we use XPG4 style, and `_', `+', and `,' if we use CEN syntax.  */
+     look for the language.  Termination symbols are `_', '.', and `@'.  */
   mask = 0;
-  syntax = undecided;
   *language = cp = name;
   cp = _nl_find_language (*language);
 
@@ -79,22 +76,23 @@ _nl_explode_name (char *name,
     /* This does not make sense: language has to be specified.  Use
        this entry as it is without exploding.  Perhaps it is an alias.  */
     cp = strchr (*language, '\0');
-  else if (cp[0] == '_')
+  else
     {
-      /* Next is the territory.  */
-      cp[0] = '\0';
-      *territory = ++cp;
+      if (cp[0] == '_')
+	{
+	  /* Next is the territory.  */
+	  cp[0] = '\0';
+	  *territory = ++cp;
 
-      while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@'
-	     && cp[0] != '+' && cp[0] != ',' && cp[0] != '_')
-	++cp;
+	  while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@')
+	    ++cp;
 
-      mask |= TERRITORY;
+	  mask |= XPG_TERRITORY;
+	}
 
       if (cp[0] == '.')
 	{
 	  /* Next is the codeset.  */
-	  syntax = xpg;
 	  cp[0] = '\0';
 	  *codeset = ++cp;
 
@@ -115,71 +113,21 @@ _nl_explode_name (char *name,
 	}
     }
 
-  if (cp[0] == '@' || (syntax != xpg && cp[0] == '+'))
+  if (cp[0] == '@')
     {
       /* Next is the modifier.  */
-      syntax = cp[0] == '@' ? xpg : cen;
       cp[0] = '\0';
       *modifier = ++cp;
 
-      while (syntax == cen && cp[0] != '\0' && cp[0] != '+'
-	     && cp[0] != ',' && cp[0] != '_')
-	++cp;
-
-      mask |= XPG_MODIFIER | CEN_AUDIENCE;
-    }
-
-  if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_'))
-    {
-      syntax = cen;
-
-      if (cp[0] == '+')
-	{
- 	  /* Next is special application (CEN syntax).  */
-	  cp[0] = '\0';
-	  *special = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_')
-	    ++cp;
-
-	  mask |= CEN_SPECIAL;
-	}
-
-      if (cp[0] == ',')
-	{
- 	  /* Next is sponsor (CEN syntax).  */
-	  cp[0] = '\0';
-	  *sponsor = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != '_')
-	    ++cp;
-
-	  mask |= CEN_SPONSOR;
-	}
-
-      if (cp[0] == '_')
-	{
- 	  /* Next is revision (CEN syntax).  */
-	  cp[0] = '\0';
-	  *revision = ++cp;
-
-	  mask |= CEN_REVISION;
-	}
+      if (cp[0] != '\0')
+	mask |= XPG_MODIFIER;
     }
 
-  /* For CEN syntax values it might be important to have the
-     separator character in the file name, not for XPG syntax.  */
-  if (syntax == xpg)
-    {
-      if (*territory != NULL && (*territory)[0] == '\0')
-	mask &= ~TERRITORY;
-
-      if (*codeset != NULL && (*codeset)[0] == '\0')
-	mask &= ~XPG_CODESET;
+  if (*territory != NULL && (*territory)[0] == '\0')
+    mask &= ~XPG_TERRITORY;
 
-      if (*modifier != NULL && (*modifier)[0] == '\0')
-	mask &= ~XPG_MODIFIER;
-    }
+  if (*codeset != NULL && (*codeset)[0] == '\0')
+    mask &= ~XPG_CODESET;
 
   return mask;
 }
diff --git a/intl/export.h b/intl/export.h
new file mode 100644
index 000000000..b5c47ad5b
--- /dev/null
+++ b/intl/export.h
@@ -0,0 +1,6 @@
+
+#if @HAVE_VISIBILITY@ && BUILDING_LIBINTL
+#define LIBINTL_DLL_EXPORTED __attribute__((__visibility__("default")))
+#else
+#define LIBINTL_DLL_EXPORTED
+#endif
diff --git a/intl/finddomain.c b/intl/finddomain.c
index 498f858ff..a25bebcb9 100644
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -1,5 +1,5 @@
 /* Handle list of needed message catalogs
-   Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2001, 2003-2006 Free Software Foundation, Inc.
    Written by Ulrich Drepper <[email protected]>, 1995.
 
    This program is free software; you can redistribute it and/or modify it
@@ -37,6 +37,17 @@
 # include "libgnuintl.h"
 #endif
 
+/* Handle multi-threaded applications.  */
+#ifdef _LIBC
+# include <bits/libc-lock.h>
+# define gl_rwlock_define_initialized __libc_rwlock_define_initialized
+# define gl_rwlock_rdlock __libc_rwlock_rdlock
+# define gl_rwlock_wrlock __libc_rwlock_wrlock
+# define gl_rwlock_unlock __libc_rwlock_unlock
+#else
+# include "lock.h"
+#endif
+
 /* @@ end of prolog @@ */
 /* List of already loaded domains.  */
 static struct loaded_l10nfile *_nl_loaded_domains;
@@ -56,44 +67,41 @@ _nl_find_domain (const char *dirname, char *locale,
   const char *territory;
   const char *codeset;
   const char *normalized_codeset;
-  const char *special;
-  const char *sponsor;
-  const char *revision;
   const char *alias_value;
   int mask;
 
   /* LOCALE can consist of up to four recognized parts for the XPG syntax:
 
-		language[_territory[.codeset]][@modifier]
-
-     and six parts for the CEN syntax:
-
-	language[_territory][+audience][+special][,[sponsor][_revision]]
+		language[_territory][.codeset][@modifier]
 
      Beside the first part all of them are allowed to be missing.  If
      the full specified locale is not found, the less specific one are
      looked for.  The various parts will be stripped off according to
      the following order:
-		(1) revision
-		(2) sponsor
-		(3) special
-		(4) codeset
-		(5) normalized codeset
-		(6) territory
-		(7) audience/modifier
+		(1) codeset
+		(2) normalized codeset
+		(3) territory
+		(4) modifier
    */
 
+  /* We need to protect modifying the _NL_LOADED_DOMAINS data.  */
+  gl_rwlock_define_initialized (static, lock);
+  gl_rwlock_rdlock (lock);
+
   /* If we have already tested for this locale entry there has to
      be one data set in the list of loaded domains.  */
   retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
 			       strlen (dirname) + 1, 0, locale, NULL, NULL,
-			       NULL, NULL, NULL, NULL, NULL, domainname, 0);
+			       NULL, NULL, domainname, 0);
+
+  gl_rwlock_unlock (lock);
+
   if (retval != NULL)
     {
       /* We know something about this locale.  */
       int cnt;
 
-      if (retval->decided == 0)
+      if (retval->decided <= 0)
 	_nl_load_domain (retval, domainbinding);
 
       if (retval->data != NULL)
@@ -101,13 +109,14 @@ _nl_find_domain (const char *dirname, char *locale,
 
       for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
 	{
-	  if (retval->successor[cnt]->decided == 0)
+	  if (retval->successor[cnt]->decided <= 0)
 	    _nl_load_domain (retval->successor[cnt], domainbinding);
 
 	  if (retval->successor[cnt]->data != NULL)
 	    break;
 	}
-      return cnt >= 0 ? retval : NULL;
+
+      return retval;
       /* NOTREACHED */
     }
 
@@ -132,30 +141,34 @@ _nl_find_domain (const char *dirname, char *locale,
     }
 
   /* Now we determine the single parts of the locale name.  First
-     look for the language.  Termination symbols are `_' and `@' if
-     we use XPG4 style, and `_', `+', and `,' if we use CEN syntax.  */
+     look for the language.  Termination symbols are `_', '.', and `@'.  */
   mask = _nl_explode_name (locale, &language, &modifier, &territory,
-			   &codeset, &normalized_codeset, &special,
-			   &sponsor, &revision);
+			   &codeset, &normalized_codeset);
+
+  /* We need to protect modifying the _NL_LOADED_DOMAINS data.  */
+  gl_rwlock_wrlock (lock);
 
   /* Create all possible locale entries which might be interested in
      generalization.  */
   retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
 			       strlen (dirname) + 1, mask, language, territory,
-			       codeset, normalized_codeset, modifier, special,
-			       sponsor, revision, domainname, 1);
+			       codeset, normalized_codeset, modifier,
+			       domainname, 1);
+
+  gl_rwlock_unlock (lock);
+
   if (retval == NULL)
     /* This means we are out of core.  */
     return NULL;
 
-  if (retval->decided == 0)
+  if (retval->decided <= 0)
     _nl_load_domain (retval, domainbinding);
   if (retval->data == NULL)
     {
       int cnt;
       for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
 	{
-	  if (retval->successor[cnt]->decided == 0)
+	  if (retval->successor[cnt]->decided <= 0)
 	    _nl_load_domain (retval->successor[cnt], domainbinding);
 	  if (retval->successor[cnt]->data != NULL)
 	    break;
@@ -175,7 +188,10 @@ _nl_find_domain (const char *dirname, char *locale,
 
 
 #ifdef _LIBC
-libc_freeres_fn (free_mem)
+/* This is called from iconv/gconv_db.c's free_mem, as locales must
+   be freed before freeing gconv steps arrays.  */
+void __libc_freeres_fn_section
+_nl_finddomain_subfreeres ()
 {
   struct loaded_l10nfile *runp = _nl_loaded_domains;
 
diff --git a/intl/gettextP.h b/intl/gettextP.h
index ccd5e87bb..8be38d2d7 100644
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -1,5 +1,5 @@
 /* Header describing internals of libintl library.
-   Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
    Written by Ulrich Drepper <[email protected]>, 1995.
 
    This program is free software; you can redistribute it and/or modify it
@@ -30,6 +30,52 @@
 # endif
 #endif
 
+#ifdef _LIBC
+extern char *__gettext (const char *__msgid);
+extern char *__dgettext (const char *__domainname, const char *__msgid);
+extern char *__dcgettext (const char *__domainname, const char *__msgid,
+			  int __category);
+extern char *__ngettext (const char *__msgid1, const char *__msgid2,
+			 unsigned long int __n);
+extern char *__dngettext (const char *__domainname,
+			  const char *__msgid1, const char *__msgid2,
+			  unsigned long int n);
+extern char *__dcngettext (const char *__domainname,
+			   const char *__msgid1, const char *__msgid2,
+			   unsigned long int __n, int __category);
+extern char *__dcigettext (const char *__domainname,
+			   const char *__msgid1, const char *__msgid2,
+			   int __plural, unsigned long int __n,
+			   int __category);
+extern char *__textdomain (const char *__domainname);
+extern char *__bindtextdomain (const char *__domainname,
+			       const char *__dirname);
+extern char *__bind_textdomain_codeset (const char *__domainname,
+					const char *__codeset);
+extern void _nl_finddomain_subfreeres (void) attribute_hidden;
+extern void _nl_unload_domain (struct loaded_domain *__domain)
+     internal_function attribute_hidden;
+#else
+/* Declare the exported libintl_* functions, in a way that allows us to
+   call them under their real name.  */
+# undef _INTL_REDIRECT_INLINE
+# undef _INTL_REDIRECT_MACROS
+# define _INTL_REDIRECT_MACROS
+# include "libgnuintl.h"
+# ifdef IN_LIBGLOCALE
+extern char *gl_dcigettext (const char *__domainname,
+			    const char *__msgid1, const char *__msgid2,
+			    int __plural, unsigned long int __n,
+			    int __category,
+			    const char *__localename, const char *__encoding);
+# else
+extern char *libintl_dcigettext (const char *__domainname,
+				 const char *__msgid1, const char *__msgid2,
+				 int __plural, unsigned long int __n,
+				 int __category);
+# endif
+#endif
+
 #include "loadinfo.h"
 
 #include "gmo.h"		/* Get nls_uint32.  */
@@ -77,6 +123,26 @@ struct sysdep_string_desc
   const char *pointer;
 };
 
+/* Cache of translated strings after charset conversion.
+   Note: The strings are converted to the target encoding only on an as-needed
+   basis.  */
+struct converted_domain
+{
+  /* The target encoding name.  */
+  const char *encoding;
+  /* The descriptor for conversion from the message catalog's encoding to
+     this target encoding.  */
+#ifdef _LIBC
+  __gconv_t conv;
+#else
+# if HAVE_ICONV
+  iconv_t conv;
+# endif
+#endif
+  /* The table of translated strings after charset conversion.  */
+  char **conv_tab;
+};
+
 /* The representation of an opened message catalog.  */
 struct loaded_domain
 {
@@ -112,15 +178,9 @@ struct loaded_domain
   /* 1 if the hash table uses a different endianness than this machine.  */
   int must_swap_hash_tab;
 
-  int codeset_cntr;
-#ifdef _LIBC
-  __gconv_t conv;
-#else
-# if HAVE_ICONV
-  iconv_t conv;
-# endif
-#endif
-  char **conv_tab;
+  /* Cache of charset conversions of the translated strings.  */
+  struct converted_domain *conversions;
+  size_t nconversions;
 
   struct expression *plural;
   unsigned long int nplurals;
@@ -140,7 +200,6 @@ struct binding
 {
   struct binding *next;
   char *dirname;
-  int codeset_cntr;	/* Incremented each time codeset changes.  */
   char *codeset;
   char domainname[ZERO];
 };
@@ -148,9 +207,17 @@ struct binding
 /* A counter which is incremented each time some previous translations
    become invalid.
    This variable is part of the external ABI of the GNU libintl.  */
-extern int _nl_msg_cat_cntr;
+#ifdef IN_LIBGLOCALE
+# include <glocale/config.h>
+extern LIBGLOCALE_DLL_EXPORTED int _nl_msg_cat_cntr;
+#else
+extern LIBINTL_DLL_EXPORTED int _nl_msg_cat_cntr;
+#endif
 
 #ifndef _LIBC
+const char *_nl_language_preferences_default (void);
+const char *_nl_locale_name_posix (int category, const char *categoryname);
+const char *_nl_locale_name_default (void);
 const char *_nl_locale_name (int category, const char *categoryname);
 #endif
 
@@ -161,53 +228,18 @@ struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale,
 void _nl_load_domain (struct loaded_l10nfile *__domain,
 		      struct binding *__domainbinding)
      internal_function;
-void _nl_unload_domain (struct loaded_domain *__domain)
-     internal_function;
-const char *_nl_init_domain_conv (struct loaded_l10nfile *__domain_file,
-				  struct loaded_domain *__domain,
-				  struct binding *__domainbinding)
-     internal_function;
-void _nl_free_domain_conv (struct loaded_domain *__domain)
-     internal_function;
 
+#ifdef IN_LIBGLOCALE
 char *_nl_find_msg (struct loaded_l10nfile *domain_file,
-		    struct binding *domainbinding, const char *msgid,
+		    struct binding *domainbinding, const char *encoding,
+		    const char *msgid,
 		    size_t *lengthp)
      internal_function;
-
-#ifdef _LIBC
-extern char *__gettext (const char *__msgid);
-extern char *__dgettext (const char *__domainname, const char *__msgid);
-extern char *__dcgettext (const char *__domainname, const char *__msgid,
-			  int __category);
-extern char *__ngettext (const char *__msgid1, const char *__msgid2,
-			 unsigned long int __n);
-extern char *__dngettext (const char *__domainname,
-			  const char *__msgid1, const char *__msgid2,
-			  unsigned long int n);
-extern char *__dcngettext (const char *__domainname,
-			   const char *__msgid1, const char *__msgid2,
-			   unsigned long int __n, int __category);
-extern char *__dcigettext (const char *__domainname,
-			   const char *__msgid1, const char *__msgid2,
-			   int __plural, unsigned long int __n,
-			   int __category);
-extern char *__textdomain (const char *__domainname);
-extern char *__bindtextdomain (const char *__domainname,
-			       const char *__dirname);
-extern char *__bind_textdomain_codeset (const char *__domainname,
-					const char *__codeset);
 #else
-/* Declare the exported libintl_* functions, in a way that allows us to
-   call them under their real name.  */
-# undef _INTL_REDIRECT_INLINE
-# undef _INTL_REDIRECT_MACROS
-# define _INTL_REDIRECT_MACROS
-# include "libgnuintl.h"
-extern char *libintl_dcigettext (const char *__domainname,
-				 const char *__msgid1, const char *__msgid2,
-				 int __plural, unsigned long int __n,
-				 int __category);
+char *_nl_find_msg (struct loaded_l10nfile *domain_file,
+		    struct binding *domainbinding, const char *msgid,
+		    int convert, size_t *lengthp)
+     internal_function;
 #endif
 
 /* @@ begin of epilog @@ */
diff --git a/intl/hash-string.c b/intl/hash-string.c
new file mode 100644
index 000000000..3c513f099
--- /dev/null
+++ b/intl/hash-string.c
@@ -0,0 +1,51 @@
+/* Implements a string hashing function.
+   Copyright (C) 1995, 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* Specification.  */
+#include "hash-string.h"
+
+
+/* Defines the so called `hashpjw' function by P.J. Weinberger
+   [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
+   1986, 1987 Bell Telephone Laboratories, Inc.]  */
+unsigned long int
+__hash_string (const char *str_param)
+{
+  unsigned long int hval, g;
+  const char *str = str_param;
+
+  /* Compute the hash value for the given string.  */
+  hval = 0;
+  while (*str != '\0')
+    {
+      hval <<= 4;
+      hval += (unsigned char) *str++;
+      g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
+      if (g != 0)
+	{
+	  hval ^= g >> (HASHWORDBITS - 8);
+	  hval ^= g;
+	}
+    }
+  return hval;
+}
diff --git a/intl/hash-string.h b/intl/hash-string.h
index 2c9a3a57e..98c07e4a7 100644
--- a/intl/hash-string.h
+++ b/intl/hash-string.h
@@ -1,5 +1,5 @@
 /* Description of GNU message catalog format: string hashing function.
-   Copyright (C) 1995, 1997-1998, 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997-1998, 2000-2003, 2005 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -22,27 +22,15 @@
 #define HASHWORDBITS 32
 
 
+#ifndef _LIBC
+# ifdef IN_LIBINTL
+#  define __hash_string libintl_hash_string
+# else
+#  define __hash_string hash_string
+# endif
+#endif
+
 /* Defines the so called `hashpjw' function by P.J. Weinberger
    [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
    1986, 1987 Bell Telephone Laboratories, Inc.]  */
-static inline unsigned long int
-hash_string (const char *str_param)
-{
-  unsigned long int hval, g;
-  const char *str = str_param;
-
-  /* Compute the hash value for the given string.  */
-  hval = 0;
-  while (*str != '\0')
-    {
-      hval <<= 4;
-      hval += (unsigned char) *str++;
-      g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
-      if (g != 0)
-	{
-	  hval ^= g >> (HASHWORDBITS - 8);
-	  hval ^= g;
-	}
-    }
-  return hval;
-}
+extern unsigned long int __hash_string (const char *str_param);
diff --git a/intl/intl-compat.c b/intl/intl-compat.c
index 15be09cbc..9b9ecbb64 100644
--- a/intl/intl-compat.c
+++ b/intl/intl-compat.c
@@ -1,6 +1,6 @@
 /* intl-compat.c - Stub functions to call gettext functions from GNU gettext
    Library.
-   Copyright (C) 1995, 2000-2003 Software Foundation, Inc.
+   Copyright (C) 1995, 2000-2003, 2005 Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -49,7 +49,9 @@
 /* When building a DLL, we must export some functions.  Note that because
    the functions are only defined for binary backward compatibility, we
    don't need to use __declspec(dllimport) in any case.  */
-#if defined _MSC_VER && BUILDING_DLL
+#if HAVE_VISIBILITY && BUILDING_DLL
+# define DLL_EXPORTED __attribute__((__visibility__("default")))
+#elif defined _MSC_VER && BUILDING_DLL
 # define DLL_EXPORTED __declspec(dllexport)
 #else
 # define DLL_EXPORTED
diff --git a/intl/intl-exports.c b/intl/intl-exports.c
new file mode 100644
index 000000000..717658994
--- /dev/null
+++ b/intl/intl-exports.c
@@ -0,0 +1,36 @@
+/* List of exported symbols of libintl on Cygwin.
+   Copyright (C) 2006 Free Software Foundation, Inc.
+   Written by Bruno Haible <[email protected]>, 2006.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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.  */
+
+ /* IMP(x) is a symbol that contains the address of x.  */
+#define IMP(x) _imp__##x
+
+ /* Ensure that the variable x is exported from the library, and that a
+    pseudo-variable IMP(x) is available.  */
+#define VARIABLE(x) \
+ /* Export x without redefining x.  This code was found by compiling a	\
+    snippet:								\
+      extern __declspec(dllexport) int x; int x = 42;  */		\
+ asm (".section .drectve\n");						\
+ asm (".ascii \" -export:" #x ",data\"\n");				\
+ asm (".data\n");							\
+ /* Allocate a pseudo-variable IMP(x).  */				\
+ extern int x;								\
+ void * IMP(x) = &x;
+
+VARIABLE(libintl_version)
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index e62aa5c90..365aeb708 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999, 2000-2006 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <[email protected]>, 1995.
 
    This program is free software; you can redistribute it and/or modify it
@@ -67,8 +67,8 @@ static char *stpcpy (char *dest, const char *src);
    IS_ABSOLUTE_PATH(P)  tests whether P is an absolute path.  If it is not,
                         it may be concatenated to a directory pathname.
  */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, OS/2, DOS */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 # define HAS_DEVICE(P) \
     ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
@@ -82,7 +82,12 @@ static char *stpcpy (char *dest, const char *src);
 
 /* Define function which are usually not available.  */
 
-#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
+#ifdef _LIBC
+# define __argz_count(argz, len) INTUSE(__argz_count) (argz, len)
+#elif defined HAVE_ARGZ_COUNT
+# undef __argz_count
+# define __argz_count argz_count
+#else
 /* Returns the number of strings in ARGZ.  */
 static size_t
 argz_count__ (const char *argz, size_t len)
@@ -99,13 +104,15 @@ argz_count__ (const char *argz, size_t len)
 }
 # undef __argz_count
 # define __argz_count(argz, len) argz_count__ (argz, len)
-#else
-# ifdef _LIBC
-#  define __argz_count(argz, len) INTUSE(__argz_count) (argz, len)
-# endif
-#endif	/* !_LIBC && !HAVE___ARGZ_COUNT */
+#endif	/* !_LIBC && !HAVE_ARGZ_COUNT */
 
-#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
+#ifdef _LIBC
+# define __argz_stringify(argz, len, sep) \
+  INTUSE(__argz_stringify) (argz, len, sep)
+#elif defined HAVE_ARGZ_STRINGIFY
+# undef __argz_stringify
+# define __argz_stringify argz_stringify
+#else
 /* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
    except the last into the character SEP.  */
 static void
@@ -122,14 +129,13 @@ argz_stringify__ (char *argz, size_t len, int sep)
 }
 # undef __argz_stringify
 # define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
-#else
-# ifdef _LIBC
-#  define __argz_stringify(argz, len, sep) \
-  INTUSE(__argz_stringify) (argz, len, sep)
-# endif
-#endif	/* !_LIBC && !HAVE___ARGZ_STRINGIFY */
+#endif	/* !_LIBC && !HAVE_ARGZ_STRINGIFY */
 
-#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
+#ifdef _LIBC
+#elif defined HAVE_ARGZ_NEXT
+# undef __argz_next
+# define __argz_next argz_next
+#else
 static char *
 argz_next__ (char *argz, size_t argz_len, const char *entry)
 {
@@ -148,7 +154,7 @@ argz_next__ (char *argz, size_t argz_len, const char *entry)
 }
 # undef __argz_next
 # define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
-#endif	/* !_LIBC && !HAVE___ARGZ_NEXT */
+#endif	/* !_LIBC && !HAVE_ARGZ_NEXT */
 
 
 /* Return number of bits set in X.  */
@@ -170,8 +176,7 @@ _nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
 		    const char *dirlist, size_t dirlist_len,
 		    int mask, const char *language, const char *territory,
 		    const char *codeset, const char *normalized_codeset,
-		    const char *modifier, const char *special,
-		    const char *sponsor, const char *revision,
+		    const char *modifier,
 		    const char *filename, int do_allocate)
 {
   char *abs_filename;
@@ -190,23 +195,14 @@ _nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
   /* Allocate room for the full file name.  */
   abs_filename = (char *) malloc (dirlist_len
 				  + strlen (language)
-				  + ((mask & TERRITORY) != 0
+				  + ((mask & XPG_TERRITORY) != 0
 				     ? strlen (territory) + 1 : 0)
 				  + ((mask & XPG_CODESET) != 0
 				     ? strlen (codeset) + 1 : 0)
 				  + ((mask & XPG_NORM_CODESET) != 0
 				     ? strlen (normalized_codeset) + 1 : 0)
-				  + (((mask & XPG_MODIFIER) != 0
-				      || (mask & CEN_AUDIENCE) != 0)
+				  + ((mask & XPG_MODIFIER) != 0
 				     ? strlen (modifier) + 1 : 0)
-				  + ((mask & CEN_SPECIAL) != 0
-				     ? strlen (special) + 1 : 0)
-				  + (((mask & CEN_SPONSOR) != 0
-				      || (mask & CEN_REVISION) != 0)
-				     ? (1 + ((mask & CEN_SPONSOR) != 0
-					     ? strlen (sponsor) : 0)
-					+ ((mask & CEN_REVISION) != 0
-					   ? strlen (revision) + 1 : 0)) : 0)
 				  + 1 + strlen (filename) + 1);
 
   if (abs_filename == NULL)
@@ -224,7 +220,7 @@ _nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
 
   cp = stpcpy (cp, language);
 
-  if ((mask & TERRITORY) != 0)
+  if ((mask & XPG_TERRITORY) != 0)
     {
       *cp++ = '_';
       cp = stpcpy (cp, territory);
@@ -239,29 +235,11 @@ _nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
       *cp++ = '.';
       cp = stpcpy (cp, normalized_codeset);
     }
-  if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0)
+  if ((mask & XPG_MODIFIER) != 0)
     {
-      /* This component can be part of both syntaces but has different
-	 leading characters.  For CEN we use `+', else `@'.  */
-      *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@';
+      *cp++ = '@';
       cp = stpcpy (cp, modifier);
     }
-  if ((mask & CEN_SPECIAL) != 0)
-    {
-      *cp++ = '+';
-      cp = stpcpy (cp, special);
-    }
-  if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0)
-    {
-      *cp++ = ',';
-      if ((mask & CEN_SPONSOR) != 0)
-	cp = stpcpy (cp, sponsor);
-      if ((mask & CEN_REVISION) != 0)
-	{
-	  *cp++ = '_';
-	  cp = stpcpy (cp, revision);
-	}
-    }
 
   *cp++ = '/';
   stpcpy (cp, filename);
@@ -301,7 +279,10 @@ _nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
 	    + (((dirlist_count << pop (mask)) + (dirlist_count > 1 ? 1 : 0))
 	       * sizeof (struct loaded_l10nfile *)));
   if (retval == NULL)
-    return NULL;
+    {
+      free (abs_filename);
+      return NULL;
+    }
 
   retval->filename = abs_filename;
 
@@ -332,8 +313,7 @@ _nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
      normalized_codeset.  */
   for (cnt = dirlist_count > 1 ? mask : mask - 1; cnt >= 0; --cnt)
     if ((cnt & ~mask) == 0
-	&& ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
-	&& ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
+	&& !((cnt & XPG_CODESET) != 0 && (cnt & XPG_NORM_CODESET) != 0))
       {
 	if (dirlist_count > 1)
 	  {
@@ -345,15 +325,14 @@ _nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
 	      retval->successor[entries++]
 		= _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1,
 				      cnt, language, territory, codeset,
-				      normalized_codeset, modifier, special,
-				      sponsor, revision, filename, 1);
+				      normalized_codeset, modifier, filename,
+				      1);
 	  }
 	else
 	  retval->successor[entries++]
 	    = _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len,
 				  cnt, language, territory, codeset,
-				  normalized_codeset, modifier, special,
-				  sponsor, revision, filename, 1);
+				  normalized_codeset, modifier, filename, 1);
       }
   retval->successor[entries] = NULL;
 
diff --git a/intl/langprefs.c b/intl/langprefs.c
new file mode 100644
index 000000000..59c8def21
--- /dev/null
+++ b/intl/langprefs.c
@@ -0,0 +1,130 @@
+/* Determine the user's language preferences.
+   Copyright (C) 2004-2006 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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.  */
+
+/* Written by Bruno Haible <[email protected]>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdlib.h>
+
+#if HAVE_CFPREFERENCESCOPYAPPVALUE
+# include <string.h>
+# include <CoreFoundation/CFPreferences.h>
+# include <CoreFoundation/CFPropertyList.h>
+# include <CoreFoundation/CFArray.h>
+# include <CoreFoundation/CFString.h>
+extern void _nl_locale_name_canonicalize (char *name);
+#endif
+
+/* Determine the user's language preferences, as a colon separated list of
+   locale names in XPG syntax
+     language[_territory][.codeset][@modifier]
+   The result must not be freed; it is statically allocated.
+   The LANGUAGE environment variable does not need to be considered; it is
+   already taken into account by the caller.  */
+
+const char *
+_nl_language_preferences_default (void)
+{
+#if HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */
+  {
+    /* Cache the preferences list, since CoreFoundation calls are expensive.  */
+    static const char *cached_languages;
+    static int cache_initialized;
+
+    if (!cache_initialized)
+      {
+	CFTypeRef preferences =
+	  CFPreferencesCopyAppValue (CFSTR ("AppleLanguages"),
+				     kCFPreferencesCurrentApplication);
+	if (preferences != NULL
+	    && CFGetTypeID (preferences) == CFArrayGetTypeID ())
+	  {
+	    CFArrayRef prefArray = (CFArrayRef)preferences;
+	    int n = CFArrayGetCount (prefArray);
+	    char buf[256];
+	    size_t size = 0;
+	    int i;
+
+	    for (i = 0; i < n; i++)
+	      {
+		CFTypeRef element = CFArrayGetValueAtIndex (prefArray, i);
+		if (element != NULL
+		    && CFGetTypeID (element) == CFStringGetTypeID ()
+		    && CFStringGetCString ((CFStringRef)element,
+					   buf, sizeof (buf),
+					   kCFStringEncodingASCII))
+		  {
+		    _nl_locale_name_canonicalize (buf);
+		    size += strlen (buf) + 1;
+		    /* Most GNU programs use msgids in English and don't ship
+		       an en.mo message catalog.  Therefore when we see "en"
+		       in the preferences list, arrange for gettext() to
+		       return the msgid, and ignore all further elements of
+		       the preferences list.  */
+		    if (strcmp (buf, "en") == 0)
+		      break;
+		  }
+		else
+		  break;
+	      }
+	    if (size > 0)
+	      {
+		char *languages = (char *) malloc (size);
+
+		if (languages != NULL)
+		  {
+		    char *p = languages;
+
+		    for (i = 0; i < n; i++)
+		      {
+			CFTypeRef element =
+			  CFArrayGetValueAtIndex (prefArray, i);
+			if (element != NULL
+		            && CFGetTypeID (element) == CFStringGetTypeID ()
+			    && CFStringGetCString ((CFStringRef)element,
+						   buf, sizeof (buf),
+						   kCFStringEncodingASCII))
+			  {
+			    _nl_locale_name_canonicalize (buf);
+			    strcpy (p, buf);
+			    p += strlen (buf);
+			    *p++ = ':';
+			    if (strcmp (buf, "en") == 0)
+			      break;
+			  }
+			else
+			  break;
+		      }
+		    *--p = '\0';
+
+		    cached_languages = languages;
+		  }
+	      }
+	  }
+	cache_initialized = 1;
+      }
+    if (cached_languages != NULL)
+      return cached_languages;
+  }
+#endif
+
+  return NULL;
+}
diff --git a/intl/libgnuintl.h.in b/intl/libgnuintl.h.in
index c8c5620de..5e1ccd676 100644
--- a/intl/libgnuintl.h.in
+++ b/intl/libgnuintl.h.in
@@ -1,5 +1,5 @@
 /* Message catalogs for internationalization.
-   Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -39,7 +39,7 @@
 /* Provide information about the supported file formats.  Returns the
    maximum minor revision number supported for a given major revision.  */
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
-  ((major) == 0 ? 1 : -1)
+  ((major) == 0 || (major) == 1 ? 1 : -1)
 
 /* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
    precedence over _conio_gettext.  */
@@ -52,6 +52,11 @@ extern "C" {
 #endif
 
 
+/* Version number: (major<<16) + (minor<<8) + subminor */
+#define LIBINTL_VERSION 0x001000
+extern int libintl_version;
+
+
 /* We redirect the functions to those prefixed with "libintl_".  This is
    necessary, because some systems define gettext/textdomain/... in the C
    library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
@@ -83,7 +88,7 @@ extern "C" {
    If he doesn't, we choose the method.  A third possible method is
    _INTL_REDIRECT_ASM, supported only by GCC.  */
 #if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
-# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
+# if __GNUC__ >= 2 && !(__APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
 #  define _INTL_REDIRECT_ASM
 # else
 #  ifdef __cplusplus
@@ -102,11 +107,21 @@ extern "C" {
 # define _INTL_ASM(cname)
 #endif
 
+/* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return
+   its n-th argument literally.  This enables GCC to warn for example about
+   printf (gettext ("foo %y")).  */
+#if __GNUC__ >= 3 && !(__APPLE_CC__ > 1 && defined __cplusplus)
+# define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
+#else
+# define _INTL_MAY_RETURN_STRING_ARG(n)
+#endif
+
 /* Look up MSGID in the current default message catalog for the current
    LC_MESSAGES locale.  If not found, returns MSGID itself (the default
    text).  */
 #ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_gettext (const char *__msgid);
+extern char *libintl_gettext (const char *__msgid)
+       _INTL_MAY_RETURN_STRING_ARG (1);
 static inline char *gettext (const char *__msgid)
 {
   return libintl_gettext (__msgid);
@@ -116,13 +131,15 @@ static inline char *gettext (const char *__msgid)
 # define gettext libintl_gettext
 #endif
 extern char *gettext (const char *__msgid)
-       _INTL_ASM (libintl_gettext);
+       _INTL_ASM (libintl_gettext)
+       _INTL_MAY_RETURN_STRING_ARG (1);
 #endif
 
 /* Look up MSGID in the DOMAINNAME message catalog for the current
    LC_MESSAGES locale.  */
 #ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dgettext (const char *__domainname, const char *__msgid);
+extern char *libintl_dgettext (const char *__domainname, const char *__msgid)
+       _INTL_MAY_RETURN_STRING_ARG (2);
 static inline char *dgettext (const char *__domainname, const char *__msgid)
 {
   return libintl_dgettext (__domainname, __msgid);
@@ -132,14 +149,16 @@ static inline char *dgettext (const char *__domainname, const char *__msgid)
 # define dgettext libintl_dgettext
 #endif
 extern char *dgettext (const char *__domainname, const char *__msgid)
-       _INTL_ASM (libintl_dgettext);
+       _INTL_ASM (libintl_dgettext)
+       _INTL_MAY_RETURN_STRING_ARG (2);
 #endif
 
 /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
    locale.  */
 #ifdef _INTL_REDIRECT_INLINE
 extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
-				int __category);
+				int __category)
+       _INTL_MAY_RETURN_STRING_ARG (2);
 static inline char *dcgettext (const char *__domainname, const char *__msgid,
 			       int __category)
 {
@@ -151,7 +170,8 @@ static inline char *dcgettext (const char *__domainname, const char *__msgid,
 #endif
 extern char *dcgettext (const char *__domainname, const char *__msgid,
 			int __category)
-       _INTL_ASM (libintl_dcgettext);
+       _INTL_ASM (libintl_dcgettext)
+       _INTL_MAY_RETURN_STRING_ARG (2);
 #endif
 
 
@@ -159,7 +179,8 @@ extern char *dcgettext (const char *__domainname, const char *__msgid,
    number N.  */
 #ifdef _INTL_REDIRECT_INLINE
 extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
-			       unsigned long int __n);
+			       unsigned long int __n)
+       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
 static inline char *ngettext (const char *__msgid1, const char *__msgid2,
 			      unsigned long int __n)
 {
@@ -171,14 +192,16 @@ static inline char *ngettext (const char *__msgid1, const char *__msgid2,
 #endif
 extern char *ngettext (const char *__msgid1, const char *__msgid2,
 		       unsigned long int __n)
-       _INTL_ASM (libintl_ngettext);
+       _INTL_ASM (libintl_ngettext)
+       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
 #endif
 
 /* Similar to `dgettext' but select the plural form corresponding to the
    number N.  */
 #ifdef _INTL_REDIRECT_INLINE
 extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
-				const char *__msgid2, unsigned long int __n);
+				const char *__msgid2, unsigned long int __n)
+       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
 static inline char *dngettext (const char *__domainname, const char *__msgid1,
 			       const char *__msgid2, unsigned long int __n)
 {
@@ -191,7 +214,8 @@ static inline char *dngettext (const char *__domainname, const char *__msgid1,
 extern char *dngettext (const char *__domainname,
 			const char *__msgid1, const char *__msgid2,
 			unsigned long int __n)
-       _INTL_ASM (libintl_dngettext);
+       _INTL_ASM (libintl_dngettext)
+       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
 #endif
 
 /* Similar to `dcgettext' but select the plural form corresponding to the
@@ -199,7 +223,8 @@ extern char *dngettext (const char *__domainname,
 #ifdef _INTL_REDIRECT_INLINE
 extern char *libintl_dcngettext (const char *__domainname,
 				 const char *__msgid1, const char *__msgid2,
-				 unsigned long int __n, int __category);
+				 unsigned long int __n, int __category)
+       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
 static inline char *dcngettext (const char *__domainname,
 				const char *__msgid1, const char *__msgid2,
 				unsigned long int __n, int __category)
@@ -213,10 +238,13 @@ static inline char *dcngettext (const char *__domainname,
 extern char *dcngettext (const char *__domainname,
 			 const char *__msgid1, const char *__msgid2,
 			 unsigned long int __n, int __category)
-       _INTL_ASM (libintl_dcngettext);
+       _INTL_ASM (libintl_dcngettext)
+       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
 #endif
 
 
+#ifndef IN_LIBGLOCALE
+
 /* Set the current default message catalog to DOMAINNAME.
    If DOMAINNAME is null, return the current default.
    If DOMAINNAME is "", reset to the default of "messages".  */
@@ -271,6 +299,8 @@ extern char *bind_textdomain_codeset (const char *__domainname,
        _INTL_ASM (libintl_bind_textdomain_codeset);
 #endif
 
+#endif /* IN_LIBGLOCALE */
+
 
 /* Support for format strings with positions in *printf(), following the
    POSIX/XSI specification.
@@ -300,6 +330,12 @@ extern int fprintf (FILE *, const char *, ...);
 extern int vfprintf (FILE *, const char *, va_list);
 
 #undef printf
+#if defined __NetBSD__ || defined __CYGWIN__ || defined __MINGW32__
+/* Don't break __attribute__((format(printf,M,N))).
+   This redefinition is only possible because the libc in NetBSD, Cygwin,
+   mingw does not have a function __printf__.  */
+# define libintl_printf __printf__
+#endif
 #define printf libintl_printf
 extern int printf (const char *, ...);
 #undef vprintf
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index d6408f2a3..a7a197031 100644
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-1999, 2000-2003 Free Software Foundation, Inc.
+/* Copyright (C) 1996-1999, 2000-2003, 2005-2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <[email protected]>, 1996.
 
@@ -36,6 +36,10 @@
 # define internal_function
 #endif
 
+#ifndef LIBINTL_DLL_EXPORTED
+# define LIBINTL_DLL_EXPORTED
+#endif
+
 /* Tell the compiler when a conditional or integer expression is
    almost always true or almost always false.  */
 #ifndef HAVE_BUILTIN_EXPECT
@@ -43,7 +47,7 @@
 #endif
 
 /* Separator in PATH like lists of pathnames.  */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
   /* Win32, OS/2, DOS */
 # define PATH_SEPARATOR ';'
 #else
@@ -52,17 +56,10 @@
 #endif
 
 /* Encoding of locale name parts.  */
-#define CEN_REVISION		1
-#define CEN_SPONSOR		2
-#define CEN_SPECIAL		4
-#define XPG_NORM_CODESET	8
-#define XPG_CODESET		16
-#define TERRITORY		32
-#define CEN_AUDIENCE		64
-#define XPG_MODIFIER		128
-
-#define CEN_SPECIFIC	(CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE)
-#define XPG_SPECIFIC	(XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER)
+#define XPG_NORM_CODESET	1
+#define XPG_CODESET		2
+#define XPG_TERRITORY		4
+#define XPG_MODIFIER		8
 
 
 struct loaded_l10nfile
@@ -89,9 +86,9 @@ extern const char *_nl_normalize_codeset (const char *codeset,
    files of the same kind, sorted in decreasing order of ->filename.
    DIRLIST and DIRLIST_LEN are an argz list of directories in which to
    look, containing at least one directory (i.e. DIRLIST_LEN > 0).
-   MASK, LANGUAGE, TERRITORY, CODESET, NORMALIZED_CODESET, MODIFIER,
-   SPECIAL, SPONSOR, REVISION are the pieces of the locale name, as
-   produced by _nl_explode_name().  FILENAME is the filename suffix.
+   MASK, LANGUAGE, TERRITORY, CODESET, NORMALIZED_CODESET, MODIFIER
+   are the pieces of the locale name, as produced by _nl_explode_name().
+   FILENAME is the filename suffix.
    The return value is the lookup result, either found in *L10NFILE_LIST,
    or - if DO_ALLOCATE is nonzero - freshly allocated, or possibly NULL.
    If the return value is non-NULL, it is added to *L10NFILE_LIST, and
@@ -103,43 +100,33 @@ _nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
 		    const char *dirlist, size_t dirlist_len, int mask,
 		    const char *language, const char *territory,
 		    const char *codeset, const char *normalized_codeset,
-		    const char *modifier, const char *special,
-		    const char *sponsor, const char *revision,
+		    const char *modifier,
 		    const char *filename, int do_allocate);
 
 /* Lookup the real locale name for a locale alias NAME, or NULL if
    NAME is not a locale alias (but possibly a real locale name).
    The return value is statically allocated and must not be freed.  */
-extern const char *_nl_expand_alias (const char *name);
+/* Part of the libintl ABI only for the sake of the gettext.m4 macro.  */
+extern LIBINTL_DLL_EXPORTED const char *_nl_expand_alias (const char *name);
 
 /* Split a locale name NAME into its pieces: language, modifier,
-   territory, codeset, special, sponsor, revision.
+   territory, codeset.
    NAME gets destructively modified: NUL bytes are inserted here and
    there.  *LANGUAGE gets assigned NAME.  Each of *MODIFIER, *TERRITORY,
-   *CODESET, *SPECIAL, *SPONSOR, *REVISION gets assigned either a
-   pointer into the old NAME string, or NULL.  *NORMALIZED_CODESET
-   gets assigned the expanded *CODESET, if it is different from *CODESET;
-   this one is dynamically allocated and has to be freed by the caller.
+   *CODESET gets assigned either a pointer into the old NAME string, or
+   NULL.  *NORMALIZED_CODESET gets assigned the expanded *CODESET, if it
+   is different from *CODESET; this one is dynamically allocated and has
+   to be freed by the caller.
    The return value is a bitmask, where each bit corresponds to one
    filled-in value:
-     XPG_MODIFIER, CEN_AUDIENCE  for *MODIFIER,
-     TERRITORY                   for *TERRITORY,
+     XPG_MODIFIER                for *MODIFIER,
+     XPG_TERRITORY               for *TERRITORY,
      XPG_CODESET                 for *CODESET,
-     XPG_NORM_CODESET            for *NORMALIZED_CODESET,
-     CEN_SPECIAL                 for *SPECIAL,
-     CEN_SPONSOR                 for *SPONSOR,
-     CEN_REVISION                for *REVISION.
+     XPG_NORM_CODESET            for *NORMALIZED_CODESET.
  */
 extern int _nl_explode_name (char *name, const char **language,
 			     const char **modifier, const char **territory,
 			     const char **codeset,
-			     const char **normalized_codeset,
-			     const char **special, const char **sponsor,
-			     const char **revision);
-
-/* Split a locale name NAME into a leading language part and all the
-   rest.  Return a pointer to the first character after the language,
-   i.e. to the first byte of the rest.  */
-extern char *_nl_find_language (const char *name);
+			     const char **normalized_codeset);
 
 #endif	/* loadinfo.h */
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index 0d59ad8f7..2520c8c21 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -1,5 +1,5 @@
 /* Load needed message catalogs.
-   Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -91,6 +91,14 @@ char *alloca ();
 
 #ifdef _LIBC
 # include "../locale/localeinfo.h"
+# include <not-cancel.h>
+#endif
+
+/* Handle multi-threaded applications.  */
+#ifdef _LIBC
+# include <bits/libc-lock.h>
+#else
+# include "lock.h"
 #endif
 
 /* Provide fallback values for macros that ought to be defined in <inttypes.h>.
@@ -457,11 +465,12 @@ char *alloca ();
 /* Rename the non ISO C functions.  This is required by the standard
    because some ISO C functions will require linking with this object
    file and the name space must not be polluted.  */
-# define open   __open
-# define close  __close
-# define read   __read
-# define mmap   __mmap
-# define munmap __munmap
+# define open(name, flags)	open_not_cancel_2 (name, flags)
+# define close(fd)		close_not_cancel_no_status (fd)
+# define read(fd, buf, n)	read_not_cancel (fd, buf, n)
+# define mmap(addr, len, prot, flags, fd, offset) \
+  __mmap (addr, len, prot, flags, fd, offset)
+# define munmap(addr, len)	__munmap (addr, len)
 #endif
 
 /* For those losing systems which don't have `alloca' we have to add
@@ -764,144 +773,6 @@ get_sysdep_segment_value (const char *name)
   return NULL;
 }
 
-/* Initialize the codeset dependent parts of an opened message catalog.
-   Return the header entry.  */
-const char *
-internal_function
-_nl_init_domain_conv (struct loaded_l10nfile *domain_file,
-		      struct loaded_domain *domain,
-		      struct binding *domainbinding)
-{
-  /* Find out about the character set the file is encoded with.
-     This can be found (in textual form) in the entry "".  If this
-     entry does not exist or if this does not contain the `charset='
-     information, we will assume the charset matches the one the
-     current locale and we don't have to perform any conversion.  */
-  char *nullentry;
-  size_t nullentrylen;
-
-  /* Preinitialize fields, to avoid recursion during _nl_find_msg.  */
-  domain->codeset_cntr =
-    (domainbinding != NULL ? domainbinding->codeset_cntr : 0);
-#ifdef _LIBC
-  domain->conv = (__gconv_t) -1;
-#else
-# if HAVE_ICONV
-  domain->conv = (iconv_t) -1;
-# endif
-#endif
-  domain->conv_tab = NULL;
-
-  /* Get the header entry.  */
-  nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen);
-
-  if (nullentry != NULL)
-    {
-#if defined _LIBC || HAVE_ICONV
-      const char *charsetstr;
-
-      charsetstr = strstr (nullentry, "charset=");
-      if (charsetstr != NULL)
-	{
-	  size_t len;
-	  char *charset;
-	  const char *outcharset;
-
-	  charsetstr += strlen ("charset=");
-	  len = strcspn (charsetstr, " \t\n");
-
-	  charset = (char *) alloca (len + 1);
-# if defined _LIBC || HAVE_MEMPCPY
-	  *((char *) mempcpy (charset, charsetstr, len)) = '\0';
-# else
-	  memcpy (charset, charsetstr, len);
-	  charset[len] = '\0';
-# endif
-
-	  /* The output charset should normally be determined by the
-	     locale.  But sometimes the locale is not used or not correctly
-	     set up, so we provide a possibility for the user to override
-	     this.  Moreover, the value specified through
-	     bind_textdomain_codeset overrides both.  */
-	  if (domainbinding != NULL && domainbinding->codeset != NULL)
-	    outcharset = domainbinding->codeset;
-	  else
-	    {
-	      outcharset = getenv ("OUTPUT_CHARSET");
-	      if (outcharset == NULL || outcharset[0] == '\0')
-		{
-# ifdef _LIBC
-		  outcharset = _NL_CURRENT (LC_CTYPE, CODESET);
-# else
-#  if HAVE_ICONV
-		  extern const char *locale_charset (void);
-		  outcharset = locale_charset ();
-#  endif
-# endif
-		}
-	    }
-
-# ifdef _LIBC
-	  /* We always want to use transliteration.  */
-	  outcharset = norm_add_slashes (outcharset, "TRANSLIT");
-	  charset = norm_add_slashes (charset, NULL);
-	  if (__gconv_open (outcharset, charset, &domain->conv,
-			    GCONV_AVOID_NOCONV)
-	      != __GCONV_OK)
-	    domain->conv = (__gconv_t) -1;
-# else
-#  if HAVE_ICONV
-	  /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
-	     we want to use transliteration.  */
-#   if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
-       || _LIBICONV_VERSION >= 0x0105
-	  if (strchr (outcharset, '/') == NULL)
-	    {
-	      char *tmp;
-
-	      len = strlen (outcharset);
-	      tmp = (char *) alloca (len + 10 + 1);
-	      memcpy (tmp, outcharset, len);
-	      memcpy (tmp + len, "//TRANSLIT", 10 + 1);
-	      outcharset = tmp;
-
-	      domain->conv = iconv_open (outcharset, charset);
-
-	      freea (outcharset);
-	    }
-	  else
-#   endif
-	    domain->conv = iconv_open (outcharset, charset);
-#  endif
-# endif
-
-	  freea (charset);
-	}
-#endif /* _LIBC || HAVE_ICONV */
-    }
-
-  return nullentry;
-}
-
-/* Frees the codeset dependent parts of an opened message catalog.  */
-void
-internal_function
-_nl_free_domain_conv (struct loaded_domain *domain)
-{
-  if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
-    free (domain->conv_tab);
-
-#ifdef _LIBC
-  if (domain->conv != (__gconv_t) -1)
-    __gconv_close (domain->conv);
-#else
-# if HAVE_ICONV
-  if (domain->conv != (iconv_t) -1)
-    iconv_close (domain->conv);
-# endif
-#endif
-}
-
 /* Load the message catalogs specified by FILENAME.  If it is no valid
    message catalog do nothing.  */
 void
@@ -909,7 +780,8 @@ internal_function
 _nl_load_domain (struct loaded_l10nfile *domain_file,
 		 struct binding *domainbinding)
 {
-  int fd;
+  __libc_lock_define_initialized_recursive (static, lock)
+  int fd = -1;
   size_t size;
 #ifdef _LIBC
   struct stat64 st;
@@ -921,8 +793,24 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
   struct loaded_domain *domain;
   int revision;
   const char *nullentry;
+  size_t nullentrylen;
 
-  domain_file->decided = 1;
+  __libc_lock_lock_recursive (lock);
+  if (domain_file->decided != 0)
+    {
+      /* There are two possibilities:
+
+	 + this is the same thread calling again during this initialization
+	   via _nl_find_msg.  We have initialized everything this call needs.
+
+	 + this is another thread which tried to initialize this object.
+	   Not necessary anymore since if the lock is available this
+	   is finished.
+      */
+      goto done;
+    }
+
+  domain_file->decided = -1;
   domain_file->data = NULL;
 
   /* Note that it would be useless to store domainbinding in domain_file
@@ -934,12 +822,12 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
      specification the locale file name is different for XPG and CEN
      syntax.  */
   if (domain_file->filename == NULL)
-    return;
+    goto out;
 
   /* Try to open the addressed file.  */
   fd = open (domain_file->filename, O_RDONLY | O_BINARY);
   if (fd == -1)
-    return;
+    goto out;
 
   /* We must know about the size of the file.  */
   if (
@@ -950,11 +838,8 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
 #endif
       || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0)
       || __builtin_expect (size < sizeof (struct mo_file_header), 0))
-    {
-      /* Something went wrong.  */
-      close (fd);
-      return;
-    }
+    /* Something went wrong.  */
+    goto out;
 
 #ifdef HAVE_MMAP
   /* Now we are ready to load the file.  If mmap() is available we try
@@ -966,6 +851,7 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
     {
       /* mmap() call was successful.  */
       close (fd);
+      fd = -1;
       use_mmap = 1;
     }
 #endif
@@ -979,7 +865,7 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
 
       data = (struct mo_file_header *) malloc (size);
       if (data == NULL)
-	return;
+	goto out;
 
       to_read = size;
       read_ptr = (char *) data;
@@ -992,8 +878,7 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
 	      if (nb == -1 && errno == EINTR)
 		continue;
 #endif
-	      close (fd);
-	      return;
+	      goto out;
 	    }
 	  read_ptr += nb;
 	  to_read -= nb;
@@ -1001,6 +886,7 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
       while (to_read > 0);
 
       close (fd);
+      fd = -1;
     }
 
   /* Using the magic number we can test whether it really is a message
@@ -1015,12 +901,12 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
       else
 #endif
 	free (data);
-      return;
+      goto out;
     }
 
   domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
   if (domain == NULL)
-    return;
+    goto out;
   domain_file->data = domain;
 
   domain->data = (char *) data;
@@ -1321,7 +1207,7 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
 		    for (i = 0; i < n_inmem_sysdep_strings; i++)
 		      {
 			const char *msgid = inmem_orig_sysdep_tab[i].pointer;
-			nls_uint32 hash_val = hash_string (msgid);
+			nls_uint32 hash_val = __hash_string (msgid);
 			nls_uint32 idx = hash_val % domain->hash_size;
 			nls_uint32 incr =
 			  1 + (hash_val % (domain->hash_size - 2));
@@ -1382,28 +1268,55 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
 	free (data);
       free (domain);
       domain_file->data = NULL;
-      return;
+      goto out;
     }
 
-  /* Now initialize the character set converter from the character set
-     the file is encoded with (found in the header entry) to the domain's
-     specified character set or the locale's character set.  */
-  nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding);
+  /* No caches of converted translations so far.  */
+  domain->conversions = NULL;
+  domain->nconversions = 0;
 
-  /* Also look for a plural specification.  */
+  /* Get the header entry and look for a plural specification.  */
+#ifdef IN_LIBGLOCALE
+  nullentry =
+    _nl_find_msg (domain_file, domainbinding, NULL, "", &nullentrylen);
+#else
+  nullentry = _nl_find_msg (domain_file, domainbinding, "", 0, &nullentrylen);
+#endif
   EXTRACT_PLURAL_EXPRESSION (nullentry, &domain->plural, &domain->nplurals);
+
+ out:
+  if (fd != -1)
+    close (fd);
+
+  domain_file->decided = 1;
+
+ done:
+  __libc_lock_unlock_recursive (lock);
 }
 
 
 #ifdef _LIBC
 void
-internal_function
+internal_function __libc_freeres_fn_section
 _nl_unload_domain (struct loaded_domain *domain)
 {
+  size_t i;
+
   if (domain->plural != &__gettext_germanic_plural)
     __gettext_free_exp (domain->plural);
 
-  _nl_free_domain_conv (domain);
+  for (i = 0; i < domain->nconversions; i++)
+    {
+      struct converted_domain *convd = &domain->conversions[i];
+
+      free (convd->encoding);
+      if (convd->conv_tab != NULL && convd->conv_tab != (char **) -1)
+	free (convd->conv_tab);
+      if (convd->conv != (__gconv_t) -1)
+	__gconv_close (convd->conv);
+    }
+  if (domain->conversions != NULL)
+    free (domain->conversions);
 
   if (domain->malloced)
     free (domain->malloced);
diff --git a/intl/localcharset.c b/intl/localcharset.c
index 449ffc7b3..e796ae71c 100644
--- a/intl/localcharset.c
+++ b/intl/localcharset.c
@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -19,30 +19,18 @@
 
 /* Written by Bruno Haible <[email protected]>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "localcharset.h"
 
-#if HAVE_STDDEF_H
-# include <stddef.h>
-#endif
-
+#include <stddef.h>
 #include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <string.h>
+#include <stdlib.h>
 
 #if defined _WIN32 || defined __WIN32__
-# undef WIN32   /* avoid warning on mingw32 */
-# define WIN32
+# define WIN32_NATIVE
 #endif
 
 #if defined __EMX__
@@ -50,15 +38,19 @@
 # define OS2
 #endif
 
-#if !defined WIN32
+#if !defined WIN32_NATIVE
 # if HAVE_LANGINFO_CODESET
 #  include <langinfo.h>
 # else
-#  if HAVE_SETLOCALE
+#  if 0 /* see comment below */
 #   include <locale.h>
 #  endif
 # endif
-#elif defined WIN32
+# ifdef __CYGWIN__
+#  define WIN32_LEAN_AND_MEAN
+#  include <windows.h>
+# endif
+#elif defined WIN32_NATIVE
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 #endif
@@ -73,8 +65,13 @@
 # define relocate(pathname) (pathname)
 #endif
 
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, OS/2, DOS */
+/* Get LIBDIR.  */
+#ifndef LIBDIR
+# include "configmake.h"
+#endif
+
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 #endif
 
@@ -107,19 +104,25 @@ static const char * volatile charset_aliases;
 
 /* Return a pointer to the contents of the charset.alias file.  */
 static const char *
-get_charset_aliases ()
+get_charset_aliases (void)
 {
   const char *cp;
 
   cp = charset_aliases;
   if (cp == NULL)
     {
-#if !(defined VMS || defined WIN32)
+#if !(defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
       FILE *fp;
-      const char *dir = relocate (LIBDIR);
+      const char *dir;
       const char *base = "charset.alias";
       char *file_name;
 
+      /* Make it possible to override the charset.alias location.  This is
+	 necessary for running the testsuite before "make install".  */
+      dir = getenv ("CHARSETALIASDIR");
+      if (dir == NULL || dir[0] == '\0')
+	dir = relocate (LIBDIR);
+
       /* Concatenate dir and base into freshly allocated file_name.  */
       {
 	size_t dir_len = strlen (dir);
@@ -141,15 +144,17 @@ get_charset_aliases ()
       else
 	{
 	  /* Parse the file's contents.  */
-	  int c;
-	  char buf1[50+1];
-	  char buf2[50+1];
 	  char *res_ptr = NULL;
 	  size_t res_size = 0;
-	  size_t l1, l2;
 
 	  for (;;)
 	    {
+	      int c;
+	      char buf1[50+1];
+	      char buf2[50+1];
+	      size_t l1, l2;
+	      char *old_res_ptr;
+
 	      c = getc (fp);
 	      if (c == EOF)
 		break;
@@ -170,6 +175,7 @@ get_charset_aliases ()
 		break;
 	      l1 = strlen (buf1);
 	      l2 = strlen (buf2);
+	      old_res_ptr = res_ptr;
 	      if (res_size == 0)
 		{
 		  res_size = l1 + 1 + l2 + 1;
@@ -184,6 +190,8 @@ get_charset_aliases ()
 		{
 		  /* Out of memory. */
 		  res_size = 0;
+		  if (old_res_ptr != NULL)
+		    free (old_res_ptr);
 		  break;
 		}
 	      strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
@@ -229,7 +237,7 @@ get_charset_aliases ()
 	   "DECKOREAN" "\0" "EUC-KR" "\0";
 # endif
 
-# if defined WIN32
+# if defined WIN32_NATIVE || defined __CYGWIN__
       /* To avoid the troubles of installing a separate file in the same
 	 directory as the DLL and of retrieving the DLL's directory at
 	 runtime, simply inline the aliases here.  */
@@ -238,6 +246,7 @@ get_charset_aliases ()
 	   "CP1361" "\0" "JOHAB" "\0"
 	   "CP20127" "\0" "ASCII" "\0"
 	   "CP20866" "\0" "KOI8-R" "\0"
+	   "CP20936" "\0" "GB2312" "\0"
 	   "CP21866" "\0" "KOI8-RU" "\0"
 	   "CP28591" "\0" "ISO-8859-1" "\0"
 	   "CP28592" "\0" "ISO-8859-2" "\0"
@@ -248,7 +257,14 @@ get_charset_aliases ()
 	   "CP28597" "\0" "ISO-8859-7" "\0"
 	   "CP28598" "\0" "ISO-8859-8" "\0"
 	   "CP28599" "\0" "ISO-8859-9" "\0"
-	   "CP28605" "\0" "ISO-8859-15" "\0";
+	   "CP28605" "\0" "ISO-8859-15" "\0"
+	   "CP38598" "\0" "ISO-8859-8" "\0"
+	   "CP51932" "\0" "EUC-JP" "\0"
+	   "CP51936" "\0" "GB2312" "\0"
+	   "CP51949" "\0" "EUC-KR" "\0"
+	   "CP51950" "\0" "EUC-TW" "\0"
+	   "CP54936" "\0" "GB18030" "\0"
+	   "CP65001" "\0" "UTF-8" "\0";
 # endif
 #endif
 
@@ -268,18 +284,65 @@ get_charset_aliases ()
 STATIC
 #endif
 const char *
-locale_charset ()
+locale_charset (void)
 {
   const char *codeset;
   const char *aliases;
 
-#if !(defined WIN32 || defined OS2)
+#if !(defined WIN32_NATIVE || defined OS2)
 
 # if HAVE_LANGINFO_CODESET
 
   /* Most systems support nl_langinfo (CODESET) nowadays.  */
   codeset = nl_langinfo (CODESET);
 
+#  ifdef __CYGWIN__
+  /* Cygwin 2006 does not have locales.  nl_langinfo (CODESET) always
+     returns "US-ASCII".  As long as this is not fixed, return the suffix
+     of the locale name from the environment variables (if present) or
+     the codepage as a number.  */
+  if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0)
+    {
+      const char *locale;
+      static char buf[2 + 10 + 1];
+
+      locale = getenv ("LC_ALL");
+      if (locale == NULL || locale[0] == '\0')
+	{
+	  locale = getenv ("LC_CTYPE");
+	  if (locale == NULL || locale[0] == '\0')
+	    locale = getenv ("LANG");
+	}
+      if (locale != NULL && locale[0] != '\0')
+	{
+	  /* If the locale name contains an encoding after the dot, return
+	     it.  */
+	  const char *dot = strchr (locale, '.');
+
+	  if (dot != NULL)
+	    {
+	      const char *modifier;
+
+	      dot++;
+	      /* Look for the possible @... trailer and remove it, if any.  */
+	      modifier = strchr (dot, '@');
+	      if (modifier == NULL)
+		return dot;
+	      if (modifier - dot < sizeof (buf))
+		{
+		  memcpy (buf, dot, modifier - dot);
+		  buf [modifier - dot] = '\0';
+		  return buf;
+		}
+	    }
+	}
+
+      /* Woe32 has a function returning the locale's codepage as a number.  */
+      sprintf (buf, "CP%u", GetACP ());
+      codeset = buf;
+    }
+#  endif
+
 # else
 
   /* On old systems which lack it, use setlocale or getenv.  */
@@ -289,7 +352,7 @@ locale_charset ()
      (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
      use setlocale here; it would return "C" when it doesn't support the
      locale name the user has set.  */
-#  if HAVE_SETLOCALE && 0
+#  if 0
   locale = setlocale (LC_CTYPE, NULL);
 #  endif
   if (locale == NULL || locale[0] == '\0')
@@ -310,7 +373,7 @@ locale_charset ()
 
 # endif
 
-#elif defined WIN32
+#elif defined WIN32_NATIVE
 
   static char buf[2 + 10 + 1];
 
diff --git a/intl/localealias.c b/intl/localealias.c
index 7a092a0df..26122a011 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -1,5 +1,5 @@
 /* Handle aliases for locale names.
-   Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2001, 2003, 2005 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -81,11 +81,13 @@ char *alloca ();
 # endif
 # define HAVE_MEMPCPY	1
 # define HAVE___FSETLOCKING	1
+#endif
 
-/* We need locking here since we can be called from different places.  */
+/* Handle multi-threaded applications.  */
+#ifdef _LIBC
 # include <bits/libc-lock.h>
-
-__libc_lock_define_initialized (static, lock);
+#else
+# include "lock.h"
 #endif
 
 #ifndef internal_function
@@ -120,6 +122,9 @@ __libc_lock_define_initialized (static, lock);
 #endif
 
 
+__libc_lock_define_initialized (static, lock)
+
+
 struct alias_map
 {
   const char *alias;
@@ -155,9 +160,7 @@ _nl_expand_alias (const char *name)
   const char *result = NULL;
   size_t added;
 
-#ifdef _LIBC
   __libc_lock_lock (lock);
-#endif
 
   if (locale_alias_path == NULL)
     locale_alias_path = LOCALE_ALIAS_PATH;
@@ -204,9 +207,7 @@ _nl_expand_alias (const char *name)
     }
   while (added != 0);
 
-#ifdef _LIBC
   __libc_lock_unlock (lock);
-#endif
 
   return result;
 }
@@ -230,7 +231,13 @@ read_alias_file (const char *fname, int fname_len)
   memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
 #endif
 
+#ifdef _LIBC
+  /* Note the file is opened with cancellation in the I/O functions
+     disabled.  */
+  fp = fopen (relocate (full_fname), "rc");
+#else
   fp = fopen (relocate (full_fname), "r");
+#endif
   freea (full_fname);
   if (fp == NULL)
     return 0;
@@ -254,11 +261,15 @@ read_alias_file (const char *fname, int fname_len)
       char *alias;
       char *value;
       char *cp;
+      int complete_line;
 
       if (FGETS (buf, sizeof buf, fp) == NULL)
 	/* EOF reached.  */
 	break;
 
+      /* Determine whether the line is complete.  */
+      complete_line = strchr (buf, '\n') != NULL;
+
       cp = buf;
       /* Ignore leading white space.  */
       while (isspace ((unsigned char) cp[0]))
@@ -280,9 +291,6 @@ read_alias_file (const char *fname, int fname_len)
 
 	  if (cp[0] != '\0')
 	    {
-	      size_t alias_len;
-	      size_t value_len;
-
 	      value = cp++;
 	      while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
 		++cp;
@@ -298,60 +306,75 @@ read_alias_file (const char *fname, int fname_len)
 	      else if (cp[0] != '\0')
 		*cp++ = '\0';
 
-	      if (nmap >= maxmap)
-		if (__builtin_expect (extend_alias_table (), 0))
-		  return added;
+#ifdef IN_LIBGLOCALE
+	      /* glibc's locale.alias contains entries for ja_JP and ko_KR
+		 that make it impossible to use a Japanese or Korean UTF-8
+		 locale under the name "ja_JP" or "ko_KR".  Ignore these
+		 entries.  */
+	      if (strchr (alias, '_') == NULL)
+#endif
+		{
+		  size_t alias_len;
+		  size_t value_len;
 
-	      alias_len = strlen (alias) + 1;
-	      value_len = strlen (value) + 1;
+		  if (nmap >= maxmap)
+		    if (__builtin_expect (extend_alias_table (), 0))
+		      goto out;
 
-	      if (string_space_act + alias_len + value_len > string_space_max)
-		{
-		  /* Increase size of memory pool.  */
-		  size_t new_size = (string_space_max
-				     + (alias_len + value_len > 1024
-					? alias_len + value_len : 1024));
-		  char *new_pool = (char *) realloc (string_space, new_size);
-		  if (new_pool == NULL)
-		    return added;
-
-		  if (__builtin_expect (string_space != new_pool, 0))
-		    {
-		      size_t i;
+		  alias_len = strlen (alias) + 1;
+		  value_len = strlen (value) + 1;
 
-		      for (i = 0; i < nmap; i++)
+		  if (string_space_act + alias_len + value_len > string_space_max)
+		    {
+		      /* Increase size of memory pool.  */
+		      size_t new_size = (string_space_max
+					 + (alias_len + value_len > 1024
+					    ? alias_len + value_len : 1024));
+		      char *new_pool = (char *) realloc (string_space, new_size);
+		      if (new_pool == NULL)
+			goto out;
+
+		      if (__builtin_expect (string_space != new_pool, 0))
 			{
-			  map[i].alias += new_pool - string_space;
-			  map[i].value += new_pool - string_space;
+			  size_t i;
+
+			  for (i = 0; i < nmap; i++)
+			    {
+			      map[i].alias += new_pool - string_space;
+			      map[i].value += new_pool - string_space;
+			    }
 			}
-		    }
 
-		  string_space = new_pool;
-		  string_space_max = new_size;
-		}
+		      string_space = new_pool;
+		      string_space_max = new_size;
+		    }
 
-	      map[nmap].alias = memcpy (&string_space[string_space_act],
-					alias, alias_len);
-	      string_space_act += alias_len;
+		  map[nmap].alias = memcpy (&string_space[string_space_act],
+					    alias, alias_len);
+		  string_space_act += alias_len;
 
-	      map[nmap].value = memcpy (&string_space[string_space_act],
-					value, value_len);
-	      string_space_act += value_len;
+		  map[nmap].value = memcpy (&string_space[string_space_act],
+					    value, value_len);
+		  string_space_act += value_len;
 
-	      ++nmap;
-	      ++added;
+		  ++nmap;
+		  ++added;
+		}
 	    }
 	}
 
       /* Possibly not the whole line fits into the buffer.  Ignore
 	 the rest of the line.  */
-      while (strchr (buf, '\n') == NULL)
-	if (FGETS (buf, sizeof buf, fp) == NULL)
-	  /* Make sure the inner loop will be left.  The outer loop
-	     will exit at the `feof' test.  */
-	  break;
+      if (! complete_line)
+	do
+	  if (FGETS (buf, sizeof buf, fp) == NULL)
+	    /* Make sure the inner loop will be left.  The outer loop
+	       will exit at the `feof' test.  */
+	    break;
+	while (strchr (buf, '\n') == NULL);
     }
 
+ out:
   /* Should we test for ferror()?  I think we have to silently ignore
      errors.  --drepper  */
   fclose (fp);
diff --git a/intl/localename.c b/intl/localename.c
index 9d651461a..e1b4615a0 100644
--- a/intl/localename.c
+++ b/intl/localename.c
@@ -1,5 +1,5 @@
 /* Determine the current selected locale.
-   Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -18,6 +18,7 @@
 
 /* Written by Ulrich Drepper <[email protected]>, 1995.  */
 /* Win32 code written by Tor Lillqvist <[email protected]>.  */
+/* MacOS X code written by Bruno Haible <[email protected]>.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -26,12 +27,21 @@
 #include <stdlib.h>
 #include <locale.h>
 
+#if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
+# include <string.h>
+# include <CoreFoundation/CFString.h>
+# if HAVE_CFLOCALECOPYCURRENT
+#  include <CoreFoundation/CFLocale.h>
+# elif HAVE_CFPREFERENCESCOPYAPPVALUE
+#  include <CoreFoundation/CFPreferences.h>
+# endif
+#endif
+
 #if defined _WIN32 || defined __WIN32__
-# undef WIN32   /* avoid warning on mingw32 */
-# define WIN32
+# define WIN32_NATIVE
 #endif
 
-#ifdef WIN32
+#ifdef WIN32_NATIVE
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 /* List of language codes, sorted by value:
@@ -683,152 +693,474 @@
 # endif
 #endif
 
+# if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
+/* MacOS X 10.2 or newer */
+
+/* Canonicalize a MacOS X locale name to a Unix locale name.
+   NAME is a sufficiently large buffer.
+   On input, it contains the MacOS X locale name.
+   On output, it contains the Unix locale name.  */
+void
+_nl_locale_name_canonicalize (char *name)
+{
+  /* This conversion is based on a posting by
+     Deborah GoldSmith <[email protected]> on 2005-03-08,
+     http://lists.apple.com/archives/carbon-dev/2005/Mar/msg00293.html */
+
+  /* Convert legacy (NeXTstep inherited) English names to Unix (ISO 639 and
+     ISO 3166) names.  Prior to MacOS X 10.3, there is no API for doing this.
+     Therefore we do it ourselves, using a table based on the results of the
+     MacOS X 10.3.8 function
+     CFLocaleCreateCanonicalLocaleIdentifierFromString().  */
+  typedef struct { const char legacy[21+1]; const char unixy[5+1]; }
+	  legacy_entry;
+  static const legacy_entry legacy_table[] = {
+    { "Afrikaans",             "af" },
+    { "Albanian",              "sq" },
+    { "Amharic",               "am" },
+    { "Arabic",                "ar" },
+    { "Armenian",              "hy" },
+    { "Assamese",              "as" },
+    { "Aymara",                "ay" },
+    { "Azerbaijani",           "az" },
+    { "Basque",                "eu" },
+    { "Belarusian",            "be" },
+    { "Belorussian",           "be" },
+    { "Bengali",               "bn" },
+    { "Brazilian Portugese",   "pt_BR" },
+    { "Brazilian Portuguese",  "pt_BR" },
+    { "Breton",                "br" },
+    { "Bulgarian",             "bg" },
+    { "Burmese",               "my" },
+    { "Byelorussian",          "be" },
+    { "Catalan",               "ca" },
+    { "Chewa",                 "ny" },
+    { "Chichewa",              "ny" },
+    { "Chinese",               "zh" },
+    { "Chinese, Simplified",   "zh_CN" },
+    { "Chinese, Traditional",  "zh_TW" },
+    { "Chinese, Tradtional",   "zh_TW" },
+    { "Croatian",              "hr" },
+    { "Czech",                 "cs" },
+    { "Danish",                "da" },
+    { "Dutch",                 "nl" },
+    { "Dzongkha",              "dz" },
+    { "English",               "en" },
+    { "Esperanto",             "eo" },
+    { "Estonian",              "et" },
+    { "Faroese",               "fo" },
+    { "Farsi",                 "fa" },
+    { "Finnish",               "fi" },
+    { "Flemish",               "nl_BE" },
+    { "French",                "fr" },
+    { "Galician",              "gl" },
+    { "Gallegan",              "gl" },
+    { "Georgian",              "ka" },
+    { "German",                "de" },
+    { "Greek",                 "el" },
+    { "Greenlandic",           "kl" },
+    { "Guarani",               "gn" },
+    { "Gujarati",              "gu" },
+    { "Hawaiian",              "haw" }, /* Yes, "haw", not "cpe".  */
+    { "Hebrew",                "he" },
+    { "Hindi",                 "hi" },
+    { "Hungarian",             "hu" },
+    { "Icelandic",             "is" },
+    { "Indonesian",            "id" },
+    { "Inuktitut",             "iu" },
+    { "Irish",                 "ga" },
+    { "Italian",               "it" },
+    { "Japanese",              "ja" },
+    { "Javanese",              "jv" },
+    { "Kalaallisut",           "kl" },
+    { "Kannada",               "kn" },
+    { "Kashmiri",              "ks" },
+    { "Kazakh",                "kk" },
+    { "Khmer",                 "km" },
+    { "Kinyarwanda",           "rw" },
+    { "Kirghiz",               "ky" },
+    { "Korean",                "ko" },
+    { "Kurdish",               "ku" },
+    { "Latin",                 "la" },
+    { "Latvian",               "lv" },
+    { "Lithuanian",            "lt" },
+    { "Macedonian",            "mk" },
+    { "Malagasy",              "mg" },
+    { "Malay",                 "ms" },
+    { "Malayalam",             "ml" },
+    { "Maltese",               "mt" },
+    { "Manx",                  "gv" },
+    { "Marathi",               "mr" },
+    { "Moldavian",             "mo" },
+    { "Mongolian",             "mn" },
+    { "Nepali",                "ne" },
+    { "Norwegian",             "nb" }, /* Yes, "nb", not the obsolete "no".  */
+    { "Nyanja",                "ny" },
+    { "Nynorsk",               "nn" },
+    { "Oriya",                 "or" },
+    { "Oromo",                 "om" },
+    { "Panjabi",               "pa" },
+    { "Pashto",                "ps" },
+    { "Persian",               "fa" },
+    { "Polish",                "pl" },
+    { "Portuguese",            "pt" },
+    { "Portuguese, Brazilian", "pt_BR" },
+    { "Punjabi",               "pa" },
+    { "Pushto",                "ps" },
+    { "Quechua",               "qu" },
+    { "Romanian",              "ro" },
+    { "Ruanda",                "rw" },
+    { "Rundi",                 "rn" },
+    { "Russian",               "ru" },
+    { "Sami",                  "se_NO" }, /* Not just "se".  */
+    { "Sanskrit",              "sa" },
+    { "Scottish",              "gd" },
+    { "Serbian",               "sr" },
+    { "Simplified Chinese",    "zh_CN" },
+    { "Sindhi",                "sd" },
+    { "Sinhalese",             "si" },
+    { "Slovak",                "sk" },
+    { "Slovenian",             "sl" },
+    { "Somali",                "so" },
+    { "Spanish",               "es" },
+    { "Sundanese",             "su" },
+    { "Swahili",               "sw" },
+    { "Swedish",               "sv" },
+    { "Tagalog",               "tl" },
+    { "Tajik",                 "tg" },
+    { "Tajiki",                "tg" },
+    { "Tamil",                 "ta" },
+    { "Tatar",                 "tt" },
+    { "Telugu",                "te" },
+    { "Thai",                  "th" },
+    { "Tibetan",               "bo" },
+    { "Tigrinya",              "ti" },
+    { "Tongan",                "to" },
+    { "Traditional Chinese",   "zh_TW" },
+    { "Turkish",               "tr" },
+    { "Turkmen",               "tk" },
+    { "Uighur",                "ug" },
+    { "Ukrainian",             "uk" },
+    { "Urdu",                  "ur" },
+    { "Uzbek",                 "uz" },
+    { "Vietnamese",            "vi" },
+    { "Welsh",                 "cy" },
+    { "Yiddish",               "yi" }
+  };
+
+  /* Convert new-style locale names with language tags (ISO 639 and ISO 15924)
+     to Unix (ISO 639 and ISO 3166) names.  */
+  typedef struct { const char langtag[7+1]; const char unixy[12+1]; }
+	  langtag_entry;
+  static const langtag_entry langtag_table[] = {
+    /* MacOS X has "az-Arab", "az-Cyrl", "az-Latn".
+       The default script for az on Unix is Latin.  */
+    { "az-Latn", "az" },
+    /* MacOS X has "ga-dots".  Does not yet exist on Unix.  */
+    { "ga-dots", "ga" },
+    /* MacOS X has "kk-Cyrl".  Does not yet exist on Unix.  */
+    /* MacOS X has "mn-Cyrl", "mn-Mong".
+       The default script for mn on Unix is Cyrillic.  */
+    { "mn-Cyrl", "mn" },
+    /* MacOS X has "ms-Arab", "ms-Latn".
+       The default script for ms on Unix is Latin.  */
+    { "ms-Latn", "ms" },
+    /* MacOS X has "tg-Cyrl".
+       The default script for tg on Unix is Cyrillic.  */
+    { "tg-Cyrl", "tg" },
+    /* MacOS X has "tk-Cyrl".  Does not yet exist on Unix.  */
+    /* MacOS X has "tt-Cyrl".
+       The default script for tt on Unix is Cyrillic.  */
+    { "tt-Cyrl", "tt" },
+    /* MacOS X has "zh-Hans", "zh-Hant".
+       Country codes are used to distinguish these on Unix.  */
+    { "zh-Hans", "zh_CN" },
+    { "zh-Hant", "zh_TW" }
+  };
+
+  /* Convert script names (ISO 15924) to Unix conventions.
+     See http://www.unicode.org/iso15924/iso15924-codes.html  */
+  typedef struct { const char script[4+1]; const char unixy[9+1]; }
+	  script_entry;
+  static const script_entry script_table[] = {
+    { "Arab", "arabic" },
+    { "Cyrl", "cyrillic" },
+    { "Mong", "mongolian" }
+  };
+
+  /* Step 1: Convert using legacy_table.  */
+  if (name[0] >= 'A' && name[0] <= 'Z')
+    {
+      unsigned int i1, i2;
+      i1 = 0;
+      i2 = sizeof (legacy_table) / sizeof (legacy_entry);
+      while (i2 - i1 > 1)
+	{
+	  /* At this point we know that if name occurs in legacy_table,
+	     its index must be >= i1 and < i2.  */
+	  unsigned int i = (i1 + i2) >> 1;
+	  const legacy_entry *p = &legacy_table[i];
+	  if (strcmp (name, p->legacy) < 0)
+	    i2 = i;
+	  else
+	    i1 = i;
+	}
+      if (strcmp (name, legacy_table[i1].legacy) == 0)
+	{
+	  strcpy (name, legacy_table[i1].unixy);
+	  return;
+	}
+    }
+
+  /* Step 2: Convert using langtag_table and script_table.  */
+  if (strlen (name) == 7 && name[2] == '-')
+    {
+      unsigned int i1, i2;
+      i1 = 0;
+      i2 = sizeof (langtag_table) / sizeof (langtag_entry);
+      while (i2 - i1 > 1)
+	{
+	  /* At this point we know that if name occurs in langtag_table,
+	     its index must be >= i1 and < i2.  */
+	  unsigned int i = (i1 + i2) >> 1;
+	  const langtag_entry *p = &langtag_table[i];
+	  if (strcmp (name, p->langtag) < 0)
+	    i2 = i;
+	  else
+	    i1 = i;
+	}
+      if (strcmp (name, langtag_table[i1].langtag) == 0)
+	{
+	  strcpy (name, langtag_table[i1].unixy);
+	  return;
+	}
+
+      i1 = 0;
+      i2 = sizeof (script_table) / sizeof (script_entry);
+      while (i2 - i1 > 1)
+	{
+	  /* At this point we know that if (name + 3) occurs in script_table,
+	     its index must be >= i1 and < i2.  */
+	  unsigned int i = (i1 + i2) >> 1;
+	  const script_entry *p = &script_table[i];
+	  if (strcmp (name + 3, p->script) < 0)
+	    i2 = i;
+	  else
+	    i1 = i;
+	}
+      if (strcmp (name + 3, script_table[i1].script) == 0)
+	{
+	  name[2] = '@';
+	  strcpy (name + 3, script_table[i1].unixy);
+	  return;
+	}
+    }
+
+  /* Step 3: Convert new-style dash to Unix underscore. */
+  {
+    char *p;
+    for (p = name; *p != '\0'; p++)
+      if (*p == '-')
+	*p = '_';
+  }
+}
+
+#endif
+
 /* XPG3 defines the result of 'setlocale (category, NULL)' as:
    "Directs 'setlocale()' to query 'category' and return the current
     setting of 'local'."
    However it does not specify the exact format.  Neither do SUSV2 and
    ISO C 99.  So we can use this feature only on selected systems (e.g.
    those using GNU C Library).  */
-#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2)
+#if defined _LIBC || (defined __GLIBC__ && __GLIBC__ >= 2)
 # define HAVE_LOCALE_NULL
 #endif
 
 /* Determine the current locale's name, and canonicalize it into XPG syntax
-     language[_territory[.codeset]][@modifier]
+     language[_territory][.codeset][@modifier]
    The codeset part in the result is not reliable; the locale_charset()
    should be used for codeset information instead.
    The result must not be freed; it is statically allocated.  */
 
 const char *
-_nl_locale_name (int category, const char *categoryname)
+_nl_locale_name_posix (int category, const char *categoryname)
 {
-  const char *retval;
-
-#ifndef WIN32
-
   /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
      On some systems this can be done by the 'setlocale' function itself.  */
-# if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
-  retval = setlocale (category, NULL);
-# else
-  /* Setting of LC_ALL overwrites all other.  */
-  retval = getenv ("LC_ALL");
-  if (retval == NULL || retval[0] == '\0')
-    {
-      /* Next comes the name of the desired category.  */
-      retval = getenv (categoryname);
-      if (retval == NULL || retval[0] == '\0')
-	{
-	  /* Last possibility is the LANG environment variable.  */
-	  retval = getenv ("LANG");
-	  if (retval == NULL || retval[0] == '\0')
-	    /* We use C as the default domain.  POSIX says this is
-	       implementation defined.  */
-	    retval = "C";
-	}
-    }
-# endif
-
-  return retval;
-
-#else /* WIN32 */
-
-  /* Return an XPG style locale name language[_territory][@modifier].
-     Don't even bother determining the codeset; it's not useful in this
-     context, because message catalogs are not specific to a single
-     codeset.  */
-
-  LCID lcid;
-  LANGID langid;
-  int primary, sub;
+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
+  return setlocale (category, NULL);
+#else
+  const char *retval;
 
-  /* Let the user override the system settings through environment
-     variables, as on POSIX systems.  */
+  /* Setting of LC_ALL overrides all other.  */
   retval = getenv ("LC_ALL");
   if (retval != NULL && retval[0] != '\0')
     return retval;
+  /* Next comes the name of the desired category.  */
   retval = getenv (categoryname);
   if (retval != NULL && retval[0] != '\0')
     return retval;
+  /* Last possibility is the LANG environment variable.  */
   retval = getenv ("LANG");
   if (retval != NULL && retval[0] != '\0')
     return retval;
 
-  /* Use native Win32 API locale ID.  */
-  lcid = GetThreadLocale ();
+  return NULL;
+#endif
+}
 
-  /* Strip off the sorting rules, keep only the language part.  */
-  langid = LANGIDFROMLCID (lcid);
+const char *
+_nl_locale_name_default (void)
+{
+  /* POSIX:2001 says:
+     "All implementations shall define a locale as the default locale, to be
+      invoked when no environment variables are set, or set to the empty
+      string.  This default locale can be the POSIX locale or any other
+      implementation-defined locale.  Some implementations may provide
+      facilities for local installation administrators to set the default
+      locale, customizing it for each location.  POSIX:2001 does not require
+      such a facility.  */
 
-  /* Split into language and territory part.  */
-  primary = PRIMARYLANGID (langid);
-  sub = SUBLANGID (langid);
+#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined(WIN32_NATIVE))
 
-  /* Dispatch on language.
-     See also http://www.unicode.org/unicode/onlinedat/languages.html .
-     For details about languages, see http://www.ethnologue.com/ .  */
-  switch (primary)
-    {
-    case LANG_AFRIKAANS: return "af_ZA";
-    case LANG_ALBANIAN: return "sq_AL";
-    case LANG_AMHARIC: return "am_ET";
-    case LANG_ARABIC:
-      switch (sub)
-	{
-	case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA";
-	case SUBLANG_ARABIC_IRAQ: return "ar_IQ";
-	case SUBLANG_ARABIC_EGYPT: return "ar_EG";
-	case SUBLANG_ARABIC_LIBYA: return "ar_LY";
-	case SUBLANG_ARABIC_ALGERIA: return "ar_DZ";
-	case SUBLANG_ARABIC_MOROCCO: return "ar_MA";
-	case SUBLANG_ARABIC_TUNISIA: return "ar_TN";
-	case SUBLANG_ARABIC_OMAN: return "ar_OM";
-	case SUBLANG_ARABIC_YEMEN: return "ar_YE";
-	case SUBLANG_ARABIC_SYRIA: return "ar_SY";
-	case SUBLANG_ARABIC_JORDAN: return "ar_JO";
-	case SUBLANG_ARABIC_LEBANON: return "ar_LB";
-	case SUBLANG_ARABIC_KUWAIT: return "ar_KW";
-	case SUBLANG_ARABIC_UAE: return "ar_AE";
-	case SUBLANG_ARABIC_BAHRAIN: return "ar_BH";
-	case SUBLANG_ARABIC_QATAR: return "ar_QA";
-	}
-      return "ar";
-    case LANG_ARMENIAN: return "hy_AM";
-    case LANG_ASSAMESE: return "as_IN";
-    case LANG_AZERI:
-      switch (sub)
-	{
-	/* FIXME: Adjust this when Azerbaijani locales appear on Unix.  */
-	case SUBLANG_AZERI_LATIN: return "az_AZ@latin";
-	case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic";
-	}
-      return "az";
-    case LANG_BASQUE:
-      return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR".  */
-    case LANG_BELARUSIAN: return "be_BY";
-    case LANG_BENGALI:
-      switch (sub)
-	{
-	case SUBLANG_BENGALI_INDIA: return "bn_IN";
-	case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
-	}
-      return "bn";
-    case LANG_BULGARIAN: return "bg_BG";
-    case LANG_BURMESE: return "my_MM";
-    case LANG_CAMBODIAN: return "km_KH";
-    case LANG_CATALAN: return "ca_ES";
-    case LANG_CHEROKEE: return "chr_US";
-    case LANG_CHINESE:
-      switch (sub)
-	{
-	case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW";
-	case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN";
-	case SUBLANG_CHINESE_HONGKONG: return "zh_HK";
-	case SUBLANG_CHINESE_SINGAPORE: return "zh_SG";
-	case SUBLANG_CHINESE_MACAU: return "zh_MO";
-	}
-      return "zh";
-    case LANG_CROATIAN:		/* LANG_CROATIAN == LANG_SERBIAN
+  /* The system does not have a way of setting the locale, other than the
+     POSIX specified environment variables.  We use C as default locale.  */
+  return "C";
+
+#else
+
+  /* Return an XPG style locale name language[_territory][@modifier].
+     Don't even bother determining the codeset; it's not useful in this
+     context, because message catalogs are not specific to a single
+     codeset.  */
+
+# if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
+  /* MacOS X 10.2 or newer */
+  {
+    /* Cache the locale name, since CoreFoundation calls are expensive.  */
+    static const char *cached_localename;
+
+    if (cached_localename == NULL)
+      {
+	char namebuf[256];
+#  if HAVE_CFLOCALECOPYCURRENT /* MacOS X 10.3 or newer */
+	CFLocaleRef locale = CFLocaleCopyCurrent ();
+	CFStringRef name = CFLocaleGetIdentifier (locale);
+
+	if (CFStringGetCString (name, namebuf, sizeof(namebuf),
+				kCFStringEncodingASCII))
+	  {
+	    _nl_locale_name_canonicalize (namebuf);
+	    cached_localename = strdup (namebuf);
+	  }
+	CFRelease (locale);
+#  elif HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */
+	CFTypeRef value =
+	  CFPreferencesCopyAppValue (CFSTR ("AppleLocale"),
+				     kCFPreferencesCurrentApplication);
+	if (value != NULL
+	    && CFGetTypeID (value) == CFStringGetTypeID ()
+	    && CFStringGetCString ((CFStringRef)value, namebuf, sizeof(namebuf),
+				   kCFStringEncodingASCII))
+	  {
+	    _nl_locale_name_canonicalize (namebuf);
+	    cached_localename = strdup (namebuf);
+	  }
+#  endif
+	if (cached_localename == NULL)
+	  cached_localename = "C";
+      }
+    return cached_localename;
+  }
+
+# endif
+
+# if defined(WIN32_NATIVE) /* WIN32, not Cygwin */
+  {
+    LCID lcid;
+    LANGID langid;
+    int primary, sub;
+
+    /* Use native Win32 API locale ID.  */
+    lcid = GetThreadLocale ();
+
+    /* Strip off the sorting rules, keep only the language part.  */
+    langid = LANGIDFROMLCID (lcid);
+
+    /* Split into language and territory part.  */
+    primary = PRIMARYLANGID (langid);
+    sub = SUBLANGID (langid);
+
+    /* Dispatch on language.
+       See also http://www.unicode.org/unicode/onlinedat/languages.html .
+       For details about languages, see http://www.ethnologue.com/ .  */
+    switch (primary)
+      {
+      case LANG_AFRIKAANS: return "af_ZA";
+      case LANG_ALBANIAN: return "sq_AL";
+      case LANG_AMHARIC: return "am_ET";
+      case LANG_ARABIC:
+	switch (sub)
+	  {
+	  case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA";
+	  case SUBLANG_ARABIC_IRAQ: return "ar_IQ";
+	  case SUBLANG_ARABIC_EGYPT: return "ar_EG";
+	  case SUBLANG_ARABIC_LIBYA: return "ar_LY";
+	  case SUBLANG_ARABIC_ALGERIA: return "ar_DZ";
+	  case SUBLANG_ARABIC_MOROCCO: return "ar_MA";
+	  case SUBLANG_ARABIC_TUNISIA: return "ar_TN";
+	  case SUBLANG_ARABIC_OMAN: return "ar_OM";
+	  case SUBLANG_ARABIC_YEMEN: return "ar_YE";
+	  case SUBLANG_ARABIC_SYRIA: return "ar_SY";
+	  case SUBLANG_ARABIC_JORDAN: return "ar_JO";
+	  case SUBLANG_ARABIC_LEBANON: return "ar_LB";
+	  case SUBLANG_ARABIC_KUWAIT: return "ar_KW";
+	  case SUBLANG_ARABIC_UAE: return "ar_AE";
+	  case SUBLANG_ARABIC_BAHRAIN: return "ar_BH";
+	  case SUBLANG_ARABIC_QATAR: return "ar_QA";
+	  }
+	return "ar";
+      case LANG_ARMENIAN: return "hy_AM";
+      case LANG_ASSAMESE: return "as_IN";
+      case LANG_AZERI:
+	switch (sub)
+	  {
+	  /* FIXME: Adjust this when Azerbaijani locales appear on Unix.  */
+	  case SUBLANG_AZERI_LATIN: return "az_AZ@latin";
+	  case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic";
+	  }
+	return "az";
+      case LANG_BASQUE:
+	switch (sub)
+	  {
+	  case SUBLANG_DEFAULT: return "eu_ES";
+	  }
+	return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR".  */
+      case LANG_BELARUSIAN: return "be_BY";
+      case LANG_BENGALI:
+	switch (sub)
+	  {
+	  case SUBLANG_BENGALI_INDIA: return "bn_IN";
+	  case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
+	  }
+	return "bn";
+      case LANG_BULGARIAN: return "bg_BG";
+      case LANG_BURMESE: return "my_MM";
+      case LANG_CAMBODIAN: return "km_KH";
+      case LANG_CATALAN: return "ca_ES";
+      case LANG_CHEROKEE: return "chr_US";
+      case LANG_CHINESE:
+	switch (sub)
+	  {
+	  case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW";
+	  case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN";
+	  case SUBLANG_CHINESE_HONGKONG: return "zh_HK";
+	  case SUBLANG_CHINESE_SINGAPORE: return "zh_SG";
+	  case SUBLANG_CHINESE_MACAU: return "zh_MO";
+	  }
+	return "zh";
+      case LANG_CROATIAN:       /* LANG_CROATIAN == LANG_SERBIAN
 				 * What used to be called Serbo-Croatian
 				 * should really now be two separate
 				 * languages because of political reasons.
@@ -836,307 +1168,332 @@ _nl_locale_name (int category, const char *categoryname)
 				 * or Croatian.)
 				 * (I can feel those flames coming already.)
 				 */
-      switch (sub)
-	{
-	case SUBLANG_DEFAULT: return "hr_HR";
-	case SUBLANG_SERBIAN_LATIN: return "sr_CS";
-	case SUBLANG_SERBIAN_CYRILLIC: return "sr_CS@cyrillic";
-	}
-      return "hr";
-    case LANG_CZECH: return "cs_CZ";
-    case LANG_DANISH: return "da_DK";
-    case LANG_DIVEHI: return "dv_MV";
-    case LANG_DUTCH:
-      switch (sub)
-	{
-	case SUBLANG_DUTCH: return "nl_NL";
-	case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE";
-	}
-      return "nl";
-    case LANG_EDO: return "bin_NG";
-    case LANG_ENGLISH:
-      switch (sub)
-	{
-	/* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought
-	 * English was the language spoken in England.
-	 * Oh well.
-	 */
-	case SUBLANG_ENGLISH_US: return "en_US";
-	case SUBLANG_ENGLISH_UK: return "en_GB";
-	case SUBLANG_ENGLISH_AUS: return "en_AU";
-	case SUBLANG_ENGLISH_CAN: return "en_CA";
-	case SUBLANG_ENGLISH_NZ: return "en_NZ";
-	case SUBLANG_ENGLISH_EIRE: return "en_IE";
-	case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA";
-	case SUBLANG_ENGLISH_JAMAICA: return "en_JM";
-	case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */
-	case SUBLANG_ENGLISH_BELIZE: return "en_BZ";
-	case SUBLANG_ENGLISH_TRINIDAD: return "en_TT";
-	case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW";
-	case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH";
-	case SUBLANG_ENGLISH_INDONESIA: return "en_ID";
-	case SUBLANG_ENGLISH_HONGKONG: return "en_HK";
-	case SUBLANG_ENGLISH_INDIA: return "en_IN";
-	case SUBLANG_ENGLISH_MALAYSIA: return "en_MY";
-	case SUBLANG_ENGLISH_SINGAPORE: return "en_SG";
-	}
-      return "en";
-    case LANG_ESTONIAN: return "et_EE";
-    case LANG_FAEROESE: return "fo_FO";
-    case LANG_FARSI: return "fa_IR";
-    case LANG_FINNISH: return "fi_FI";
-    case LANG_FRENCH:
-      switch (sub)
-	{
-	case SUBLANG_FRENCH: return "fr_FR";
-	case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE";
-	case SUBLANG_FRENCH_CANADIAN: return "fr_CA";
-	case SUBLANG_FRENCH_SWISS: return "fr_CH";
-	case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU";
-	case SUBLANG_FRENCH_MONACO: return "fr_MC";
-	case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */
-	case SUBLANG_FRENCH_REUNION: return "fr_RE";
-	case SUBLANG_FRENCH_CONGO: return "fr_CG";
-	case SUBLANG_FRENCH_SENEGAL: return "fr_SN";
-	case SUBLANG_FRENCH_CAMEROON: return "fr_CM";
-	case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI";
-	case SUBLANG_FRENCH_MALI: return "fr_ML";
-	case SUBLANG_FRENCH_MOROCCO: return "fr_MA";
-	case SUBLANG_FRENCH_HAITI: return "fr_HT";
-	}
-      return "fr";
-    case LANG_FRISIAN: return "fy_NL";
-    case LANG_FULFULDE:
-      /* Spoken in Nigeria, Guinea, Senegal, Mali, Niger, Cameroon, Benin. */
-      return "ff_NG";
-    case LANG_GAELIC:
-      switch (sub)
-	{
-	case 0x01: /* SCOTTISH */ return "gd_GB";
-	case 0x02: /* IRISH */ return "ga_IE";
-	}
-      return "C";
-    case LANG_GALICIAN: return "gl_ES";
-    case LANG_GEORGIAN: return "ka_GE";
-    case LANG_GERMAN:
-      switch (sub)
-	{
-	case SUBLANG_GERMAN: return "de_DE";
-	case SUBLANG_GERMAN_SWISS: return "de_CH";
-	case SUBLANG_GERMAN_AUSTRIAN: return "de_AT";
-	case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU";
-	case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI";
-	}
-      return "de";
-    case LANG_GREEK: return "el_GR";
-    case LANG_GUARANI: return "gn_PY";
-    case LANG_GUJARATI: return "gu_IN";
-    case LANG_HAUSA: return "ha_NG";
-    case LANG_HAWAIIAN:
-      /* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers)
-	 or Hawaii Creole English ("cpe_US", 600000 speakers)?  */
-      return "cpe_US";
-    case LANG_HEBREW: return "he_IL";
-    case LANG_HINDI: return "hi_IN";
-    case LANG_HUNGARIAN: return "hu_HU";
-    case LANG_IBIBIO: return "nic_NG";
-    case LANG_ICELANDIC: return "is_IS";
-    case LANG_IGBO: return "ig_NG";
-    case LANG_INDONESIAN: return "id_ID";
-    case LANG_INUKTITUT: return "iu_CA";
-    case LANG_ITALIAN:
-      switch (sub)
-	{
-	case SUBLANG_ITALIAN: return "it_IT";
-	case SUBLANG_ITALIAN_SWISS: return "it_CH";
-	}
-      return "it";
-    case LANG_JAPANESE: return "ja_JP";
-    case LANG_KANNADA: return "kn_IN";
-    case LANG_KANURI: return "kr_NG";
-    case LANG_KASHMIRI:
-      switch (sub)
-	{
-	case SUBLANG_DEFAULT: return "ks_PK";
-	case SUBLANG_KASHMIRI_INDIA: return "ks_IN";
-	}
-      return "ks";
-    case LANG_KAZAK: return "kk_KZ";
-    case LANG_KONKANI:
-      /* FIXME: Adjust this when such locales appear on Unix.  */
-      return "kok_IN";
-    case LANG_KOREAN: return "ko_KR";
-    case LANG_KYRGYZ: return "ky_KG";
-    case LANG_LAO: return "lo_LA";
-    case LANG_LATIN: return "la_VA";
-    case LANG_LATVIAN: return "lv_LV";
-    case LANG_LITHUANIAN: return "lt_LT";
-    case LANG_MACEDONIAN: return "mk_MK";
-    case LANG_MALAY:
-      switch (sub)
-	{
-	case SUBLANG_MALAY_MALAYSIA: return "ms_MY";
-	case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN";
-	}
-      return "ms";
-    case LANG_MALAYALAM: return "ml_IN";
-    case LANG_MALTESE: return "mt_MT";
-    case LANG_MANIPURI:
-      /* FIXME: Adjust this when such locales appear on Unix.  */
-      return "mni_IN";
-    case LANG_MARATHI: return "mr_IN";
-    case LANG_MONGOLIAN:
-      return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN".  */
-    case LANG_NEPALI:
-      switch (sub)
-	{
-	case SUBLANG_DEFAULT: return "ne_NP";
-	case SUBLANG_NEPALI_INDIA: return "ne_IN";
-	}
-      return "ne";
-    case LANG_NORWEGIAN:
-      switch (sub)
-	{
-	case SUBLANG_NORWEGIAN_BOKMAL: return "no_NO";
-	case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO";
-	}
-      return "no";
-    case LANG_ORIYA: return "or_IN";
-    case LANG_OROMO: return "om_ET";
-    case LANG_PAPIAMENTU: return "pap_AN";
-    case LANG_PASHTO:
-      return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF".  */
-    case LANG_POLISH: return "pl_PL";
-    case LANG_PORTUGUESE:
-      switch (sub)
-	{
-	case SUBLANG_PORTUGUESE: return "pt_PT";
-	/* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT.
-	   Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */
-	case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR";
-	}
-      return "pt";
-    case LANG_PUNJABI:
-      switch (sub)
-	{
-	case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
-	case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
-	}
-      return "pa";
-    case LANG_RHAETO_ROMANCE: return "rm_CH";
-    case LANG_ROMANIAN:
-      switch (sub)
-	{
-	case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
-	case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
-	}
-      return "ro";
-    case LANG_RUSSIAN:
-      return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD".  */
-    case LANG_SAAMI: /* actually Northern Sami */ return "se_NO";
-    case LANG_SANSKRIT: return "sa_IN";
-    case LANG_SINDHI:
-      switch (sub)
-	{
-	case SUBLANG_SINDHI_INDIA: return "sd_IN";
-	case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
-	}
-      return "sd";
-    case LANG_SINHALESE: return "si_LK";
-    case LANG_SLOVAK: return "sk_SK";
-    case LANG_SLOVENIAN: return "sl_SI";
-    case LANG_SOMALI: return "so_SO";
-    case LANG_SORBIAN:
-      /* FIXME: Adjust this when such locales appear on Unix.  */
-      return "wen_DE";
-    case LANG_SPANISH:
-      switch (sub)
-	{
-	case SUBLANG_SPANISH: return "es_ES";
-	case SUBLANG_SPANISH_MEXICAN: return "es_MX";
-	case SUBLANG_SPANISH_MODERN:
-	  return "es_ES@modern";	/* not seen on Unix */
-	case SUBLANG_SPANISH_GUATEMALA: return "es_GT";
-	case SUBLANG_SPANISH_COSTA_RICA: return "es_CR";
-	case SUBLANG_SPANISH_PANAMA: return "es_PA";
-	case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO";
-	case SUBLANG_SPANISH_VENEZUELA: return "es_VE";
-	case SUBLANG_SPANISH_COLOMBIA: return "es_CO";
-	case SUBLANG_SPANISH_PERU: return "es_PE";
-	case SUBLANG_SPANISH_ARGENTINA: return "es_AR";
-	case SUBLANG_SPANISH_ECUADOR: return "es_EC";
-	case SUBLANG_SPANISH_CHILE: return "es_CL";
-	case SUBLANG_SPANISH_URUGUAY: return "es_UY";
-	case SUBLANG_SPANISH_PARAGUAY: return "es_PY";
-	case SUBLANG_SPANISH_BOLIVIA: return "es_BO";
-	case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV";
-	case SUBLANG_SPANISH_HONDURAS: return "es_HN";
-	case SUBLANG_SPANISH_NICARAGUA: return "es_NI";
-	case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR";
-	}
-      return "es";
-    case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */
-    case LANG_SWAHILI: return "sw_KE";
-    case LANG_SWEDISH:
-      switch (sub)
-	{
-	case SUBLANG_DEFAULT: return "sv_SE";
-	case SUBLANG_SWEDISH_FINLAND: return "sv_FI";
-	}
-      return "sv";
-    case LANG_SYRIAC: return "syr_TR"; /* An extinct language.  */
-    case LANG_TAGALOG: return "tl_PH";
-    case LANG_TAJIK: return "tg_TJ";
-    case LANG_TAMAZIGHT:
-      switch (sub)
-	{
-	/* FIXME: Adjust this when Tamazight locales appear on Unix.  */
-	case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic";
-	case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA@latin";
-	}
-      return "ber_MA";
-    case LANG_TAMIL:
-      return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG".  */
-    case LANG_TATAR: return "tt_RU";
-    case LANG_TELUGU: return "te_IN";
-    case LANG_THAI: return "th_TH";
-    case LANG_TIBETAN: return "bo_CN";
-    case LANG_TIGRINYA:
-      switch (sub)
-	{
-	case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET";
-	case SUBLANG_TIGRINYA_ERITREA: return "ti_ER";
-	}
-      return "ti";
-    case LANG_TSONGA: return "ts_ZA";
-    case LANG_TSWANA: return "tn_BW";
-    case LANG_TURKISH: return "tr_TR";
-    case LANG_TURKMEN: return "tk_TM";
-    case LANG_UKRAINIAN: return "uk_UA";
-    case LANG_URDU:
-      switch (sub)
-	{
-	case SUBLANG_URDU_PAKISTAN: return "ur_PK";
-	case SUBLANG_URDU_INDIA: return "ur_IN";
-	}
-      return "ur";
-    case LANG_UZBEK:
-      switch (sub)
-	{
-	case SUBLANG_UZBEK_LATIN: return "uz_UZ";
-	case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic";
-	}
-      return "uz";
-    case LANG_VENDA: return "ve_ZA";
-    case LANG_VIETNAMESE: return "vi_VN";
-    case LANG_WELSH: return "cy_GB";
-    case LANG_XHOSA: return "xh_ZA";
-    case LANG_YI: return "sit_CN";
-    case LANG_YIDDISH: return "yi_IL";
-    case LANG_YORUBA: return "yo_NG";
-    case LANG_ZULU: return "zu_ZA";
-    default: return "C";
-    }
-
+	switch (sub)
+	  {
+	  case SUBLANG_DEFAULT: return "hr_HR";
+	  case SUBLANG_SERBIAN_LATIN: return "sr_CS";
+	  case SUBLANG_SERBIAN_CYRILLIC: return "sr_CS@cyrillic";
+	  }
+	return "hr";
+      case LANG_CZECH: return "cs_CZ";
+      case LANG_DANISH: return "da_DK";
+      case LANG_DIVEHI: return "dv_MV";
+      case LANG_DUTCH:
+	switch (sub)
+	  {
+	  case SUBLANG_DUTCH: return "nl_NL";
+	  case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE";
+	  }
+	return "nl";
+      case LANG_EDO: return "bin_NG";
+      case LANG_ENGLISH:
+	switch (sub)
+	  {
+	  /* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought
+	   * English was the language spoken in England.
+	   * Oh well.
+	   */
+	  case SUBLANG_ENGLISH_US: return "en_US";
+	  case SUBLANG_ENGLISH_UK: return "en_GB";
+	  case SUBLANG_ENGLISH_AUS: return "en_AU";
+	  case SUBLANG_ENGLISH_CAN: return "en_CA";
+	  case SUBLANG_ENGLISH_NZ: return "en_NZ";
+	  case SUBLANG_ENGLISH_EIRE: return "en_IE";
+	  case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA";
+	  case SUBLANG_ENGLISH_JAMAICA: return "en_JM";
+	  case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */
+	  case SUBLANG_ENGLISH_BELIZE: return "en_BZ";
+	  case SUBLANG_ENGLISH_TRINIDAD: return "en_TT";
+	  case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW";
+	  case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH";
+	  case SUBLANG_ENGLISH_INDONESIA: return "en_ID";
+	  case SUBLANG_ENGLISH_HONGKONG: return "en_HK";
+	  case SUBLANG_ENGLISH_INDIA: return "en_IN";
+	  case SUBLANG_ENGLISH_MALAYSIA: return "en_MY";
+	  case SUBLANG_ENGLISH_SINGAPORE: return "en_SG";
+	  }
+	return "en";
+      case LANG_ESTONIAN: return "et_EE";
+      case LANG_FAEROESE: return "fo_FO";
+      case LANG_FARSI: return "fa_IR";
+      case LANG_FINNISH: return "fi_FI";
+      case LANG_FRENCH:
+	switch (sub)
+	  {
+	  case SUBLANG_FRENCH: return "fr_FR";
+	  case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE";
+	  case SUBLANG_FRENCH_CANADIAN: return "fr_CA";
+	  case SUBLANG_FRENCH_SWISS: return "fr_CH";
+	  case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU";
+	  case SUBLANG_FRENCH_MONACO: return "fr_MC";
+	  case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */
+	  case SUBLANG_FRENCH_REUNION: return "fr_RE";
+	  case SUBLANG_FRENCH_CONGO: return "fr_CG";
+	  case SUBLANG_FRENCH_SENEGAL: return "fr_SN";
+	  case SUBLANG_FRENCH_CAMEROON: return "fr_CM";
+	  case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI";
+	  case SUBLANG_FRENCH_MALI: return "fr_ML";
+	  case SUBLANG_FRENCH_MOROCCO: return "fr_MA";
+	  case SUBLANG_FRENCH_HAITI: return "fr_HT";
+	  }
+	return "fr";
+      case LANG_FRISIAN: return "fy_NL";
+      case LANG_FULFULDE:
+	/* Spoken in Nigeria, Guinea, Senegal, Mali, Niger, Cameroon, Benin.  */
+	return "ff_NG";
+      case LANG_GAELIC:
+	switch (sub)
+	  {
+	  case 0x01: /* SCOTTISH */ return "gd_GB";
+	  case 0x02: /* IRISH */ return "ga_IE";
+	  }
+	return "C";
+      case LANG_GALICIAN: return "gl_ES";
+      case LANG_GEORGIAN: return "ka_GE";
+      case LANG_GERMAN:
+	switch (sub)
+	  {
+	  case SUBLANG_GERMAN: return "de_DE";
+	  case SUBLANG_GERMAN_SWISS: return "de_CH";
+	  case SUBLANG_GERMAN_AUSTRIAN: return "de_AT";
+	  case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU";
+	  case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI";
+	  }
+	return "de";
+      case LANG_GREEK: return "el_GR";
+      case LANG_GUARANI: return "gn_PY";
+      case LANG_GUJARATI: return "gu_IN";
+      case LANG_HAUSA: return "ha_NG";
+      case LANG_HAWAIIAN:
+	/* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers)
+	   or Hawaii Creole English ("cpe_US", 600000 speakers)?  */
+	return "cpe_US";
+      case LANG_HEBREW: return "he_IL";
+      case LANG_HINDI: return "hi_IN";
+      case LANG_HUNGARIAN: return "hu_HU";
+      case LANG_IBIBIO: return "nic_NG";
+      case LANG_ICELANDIC: return "is_IS";
+      case LANG_IGBO: return "ig_NG";
+      case LANG_INDONESIAN: return "id_ID";
+      case LANG_INUKTITUT: return "iu_CA";
+      case LANG_ITALIAN:
+	switch (sub)
+	  {
+	  case SUBLANG_ITALIAN: return "it_IT";
+	  case SUBLANG_ITALIAN_SWISS: return "it_CH";
+	  }
+	return "it";
+      case LANG_JAPANESE: return "ja_JP";
+      case LANG_KANNADA: return "kn_IN";
+      case LANG_KANURI: return "kr_NG";
+      case LANG_KASHMIRI:
+	switch (sub)
+	  {
+	  case SUBLANG_DEFAULT: return "ks_PK";
+	  case SUBLANG_KASHMIRI_INDIA: return "ks_IN";
+	  }
+	return "ks";
+      case LANG_KAZAK: return "kk_KZ";
+      case LANG_KONKANI:
+	/* FIXME: Adjust this when such locales appear on Unix.  */
+	return "kok_IN";
+      case LANG_KOREAN: return "ko_KR";
+      case LANG_KYRGYZ: return "ky_KG";
+      case LANG_LAO: return "lo_LA";
+      case LANG_LATIN: return "la_VA";
+      case LANG_LATVIAN: return "lv_LV";
+      case LANG_LITHUANIAN: return "lt_LT";
+      case LANG_MACEDONIAN: return "mk_MK";
+      case LANG_MALAY:
+	switch (sub)
+	  {
+	  case SUBLANG_MALAY_MALAYSIA: return "ms_MY";
+	  case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN";
+	  }
+	return "ms";
+      case LANG_MALAYALAM: return "ml_IN";
+      case LANG_MALTESE: return "mt_MT";
+      case LANG_MANIPURI:
+	/* FIXME: Adjust this when such locales appear on Unix.  */
+	return "mni_IN";
+      case LANG_MARATHI: return "mr_IN";
+      case LANG_MONGOLIAN:
+	switch (sub)
+	  {
+	  case SUBLANG_DEFAULT: return "mn_MN";
+	  }
+	return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN".  */
+      case LANG_NEPALI:
+	switch (sub)
+	  {
+	  case SUBLANG_DEFAULT: return "ne_NP";
+	  case SUBLANG_NEPALI_INDIA: return "ne_IN";
+	  }
+	return "ne";
+      case LANG_NORWEGIAN:
+	switch (sub)
+	  {
+	  case SUBLANG_NORWEGIAN_BOKMAL: return "nb_NO";
+	  case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO";
+	  }
+	return "no";
+      case LANG_ORIYA: return "or_IN";
+      case LANG_OROMO: return "om_ET";
+      case LANG_PAPIAMENTU: return "pap_AN";
+      case LANG_PASHTO:
+	return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF".  */
+      case LANG_POLISH: return "pl_PL";
+      case LANG_PORTUGUESE:
+	switch (sub)
+	  {
+	  case SUBLANG_PORTUGUESE: return "pt_PT";
+	  /* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT.
+	     Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */
+	  case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR";
+	  }
+	return "pt";
+      case LANG_PUNJABI:
+	switch (sub)
+	  {
+	  case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
+	  case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
+	  }
+	return "pa";
+      case LANG_RHAETO_ROMANCE: return "rm_CH";
+      case LANG_ROMANIAN:
+	switch (sub)
+	  {
+	  case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
+	  case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
+	  }
+	return "ro";
+      case LANG_RUSSIAN:
+	switch (sub)
+	  {
+	  case SUBLANG_DEFAULT: return "ru_RU";
+	  }
+	return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD".  */
+      case LANG_SAAMI: /* actually Northern Sami */ return "se_NO";
+      case LANG_SANSKRIT: return "sa_IN";
+      case LANG_SINDHI:
+	switch (sub)
+	  {
+	  case SUBLANG_SINDHI_INDIA: return "sd_IN";
+	  case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
+	  }
+	return "sd";
+      case LANG_SINHALESE: return "si_LK";
+      case LANG_SLOVAK: return "sk_SK";
+      case LANG_SLOVENIAN: return "sl_SI";
+      case LANG_SOMALI: return "so_SO";
+      case LANG_SORBIAN:
+	/* FIXME: Adjust this when such locales appear on Unix.  */
+	return "wen_DE";
+      case LANG_SPANISH:
+	switch (sub)
+	  {
+	  case SUBLANG_SPANISH: return "es_ES";
+	  case SUBLANG_SPANISH_MEXICAN: return "es_MX";
+	  case SUBLANG_SPANISH_MODERN:
+	    return "es_ES@modern";	/* not seen on Unix */
+	  case SUBLANG_SPANISH_GUATEMALA: return "es_GT";
+	  case SUBLANG_SPANISH_COSTA_RICA: return "es_CR";
+	  case SUBLANG_SPANISH_PANAMA: return "es_PA";
+	  case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO";
+	  case SUBLANG_SPANISH_VENEZUELA: return "es_VE";
+	  case SUBLANG_SPANISH_COLOMBIA: return "es_CO";
+	  case SUBLANG_SPANISH_PERU: return "es_PE";
+	  case SUBLANG_SPANISH_ARGENTINA: return "es_AR";
+	  case SUBLANG_SPANISH_ECUADOR: return "es_EC";
+	  case SUBLANG_SPANISH_CHILE: return "es_CL";
+	  case SUBLANG_SPANISH_URUGUAY: return "es_UY";
+	  case SUBLANG_SPANISH_PARAGUAY: return "es_PY";
+	  case SUBLANG_SPANISH_BOLIVIA: return "es_BO";
+	  case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV";
+	  case SUBLANG_SPANISH_HONDURAS: return "es_HN";
+	  case SUBLANG_SPANISH_NICARAGUA: return "es_NI";
+	  case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR";
+	  }
+	return "es";
+      case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */
+      case LANG_SWAHILI: return "sw_KE";
+      case LANG_SWEDISH:
+	switch (sub)
+	  {
+	  case SUBLANG_DEFAULT: return "sv_SE";
+	  case SUBLANG_SWEDISH_FINLAND: return "sv_FI";
+	  }
+	return "sv";
+      case LANG_SYRIAC: return "syr_TR"; /* An extinct language.  */
+      case LANG_TAGALOG: return "tl_PH";
+      case LANG_TAJIK: return "tg_TJ";
+      case LANG_TAMAZIGHT:
+	switch (sub)
+	  {
+	  /* FIXME: Adjust this when Tamazight locales appear on Unix.  */
+	  case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic";
+	  case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA@latin";
+	  }
+	return "ber_MA";
+      case LANG_TAMIL:
+	switch (sub)
+	  {
+	  case SUBLANG_DEFAULT: return "ta_IN";
+	  }
+	return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG".  */
+      case LANG_TATAR: return "tt_RU";
+      case LANG_TELUGU: return "te_IN";
+      case LANG_THAI: return "th_TH";
+      case LANG_TIBETAN: return "bo_CN";
+      case LANG_TIGRINYA:
+	switch (sub)
+	  {
+	  case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET";
+	  case SUBLANG_TIGRINYA_ERITREA: return "ti_ER";
+	  }
+	return "ti";
+      case LANG_TSONGA: return "ts_ZA";
+      case LANG_TSWANA: return "tn_BW";
+      case LANG_TURKISH: return "tr_TR";
+      case LANG_TURKMEN: return "tk_TM";
+      case LANG_UKRAINIAN: return "uk_UA";
+      case LANG_URDU:
+	switch (sub)
+	  {
+	  case SUBLANG_URDU_PAKISTAN: return "ur_PK";
+	  case SUBLANG_URDU_INDIA: return "ur_IN";
+	  }
+	return "ur";
+      case LANG_UZBEK:
+	switch (sub)
+	  {
+	  case SUBLANG_UZBEK_LATIN: return "uz_UZ";
+	  case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic";
+	  }
+	return "uz";
+      case LANG_VENDA: return "ve_ZA";
+      case LANG_VIETNAMESE: return "vi_VN";
+      case LANG_WELSH: return "cy_GB";
+      case LANG_XHOSA: return "xh_ZA";
+      case LANG_YI: return "sit_CN";
+      case LANG_YIDDISH: return "yi_IL";
+      case LANG_YORUBA: return "yo_NG";
+      case LANG_ZULU: return "zu_ZA";
+      default: return "C";
+      }
+  }
+# endif
 #endif
 }
+
+const char *
+_nl_locale_name (int category, const char *categoryname)
+{
+  const char *retval;
+
+  retval = _nl_locale_name_posix (category, categoryname);
+  if (retval != NULL)
+    return retval;
+
+  return _nl_locale_name_default ();
+}
diff --git a/intl/lock.c b/intl/lock.c
new file mode 100644
index 000000000..f60a8d9be
--- /dev/null
+++ b/intl/lock.c
@@ -0,0 +1,922 @@
+/* Locking in multithreaded situations.
+   Copyright (C) 2005-2006 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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.  */
+
+/* Written by Bruno Haible <[email protected]>, 2005.
+   Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
+   gthr-win32.h.  */
+
+#include <config.h>
+
+#include "lock.h"
+
+/* ========================================================================= */
+
+#if USE_POSIX_THREADS
+
+/* Use the POSIX threads library.  */
+
+# if PTHREAD_IN_USE_DETECTION_HARD
+
+/* The function to be executed by a dummy thread.  */
+static void *
+dummy_thread_func (void *arg)
+{
+  return arg;
+}
+
+int
+glthread_in_use (void)
+{
+  static int tested;
+  static int result; /* 1: linked with -lpthread, 0: only with libc */
+
+  if (!tested)
+    {
+      pthread_t thread;
+
+      if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0)
+	/* Thread creation failed.  */
+	result = 0;
+      else
+	{
+	  /* Thread creation works.  */
+	  void *retval;
+	  if (pthread_join (thread, &retval) != 0)
+	    abort ();
+	  result = 1;
+	}
+      tested = 1;
+    }
+  return result;
+}
+
+# endif
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+# if HAVE_PTHREAD_RWLOCK
+
+#  if !defined PTHREAD_RWLOCK_INITIALIZER
+
+void
+glthread_rwlock_init (gl_rwlock_t *lock)
+{
+  if (pthread_rwlock_init (&lock->rwlock, NULL) != 0)
+    abort ();
+  lock->initialized = 1;
+}
+
+void
+glthread_rwlock_rdlock (gl_rwlock_t *lock)
+{
+  if (!lock->initialized)
+    {
+      if (pthread_mutex_lock (&lock->guard) != 0)
+	abort ();
+      if (!lock->initialized)
+	glthread_rwlock_init (lock);
+      if (pthread_mutex_unlock (&lock->guard) != 0)
+	abort ();
+    }
+  if (pthread_rwlock_rdlock (&lock->rwlock) != 0)
+    abort ();
+}
+
+void
+glthread_rwlock_wrlock (gl_rwlock_t *lock)
+{
+  if (!lock->initialized)
+    {
+      if (pthread_mutex_lock (&lock->guard) != 0)
+	abort ();
+      if (!lock->initialized)
+	glthread_rwlock_init (lock);
+      if (pthread_mutex_unlock (&lock->guard) != 0)
+	abort ();
+    }
+  if (pthread_rwlock_wrlock (&lock->rwlock) != 0)
+    abort ();
+}
+
+void
+glthread_rwlock_unlock (gl_rwlock_t *lock)
+{
+  if (!lock->initialized)
+    abort ();
+  if (pthread_rwlock_unlock (&lock->rwlock) != 0)
+    abort ();
+}
+
+void
+glthread_rwlock_destroy (gl_rwlock_t *lock)
+{
+  if (!lock->initialized)
+    abort ();
+  if (pthread_rwlock_destroy (&lock->rwlock) != 0)
+    abort ();
+  lock->initialized = 0;
+}
+
+#  endif
+
+# else
+
+void
+glthread_rwlock_init (gl_rwlock_t *lock)
+{
+  if (pthread_mutex_init (&lock->lock, NULL) != 0)
+    abort ();
+  if (pthread_cond_init (&lock->waiting_readers, NULL) != 0)
+    abort ();
+  if (pthread_cond_init (&lock->waiting_writers, NULL) != 0)
+    abort ();
+  lock->waiting_writers_count = 0;
+  lock->runcount = 0;
+}
+
+void
+glthread_rwlock_rdlock (gl_rwlock_t *lock)
+{
+  if (pthread_mutex_lock (&lock->lock) != 0)
+    abort ();
+  /* Test whether only readers are currently running, and whether the runcount
+     field will not overflow.  */
+  /* POSIX says: "It is implementation-defined whether the calling thread
+     acquires the lock when a writer does not hold the lock and there are
+     writers blocked on the lock."  Let's say, no: give the writers a higher
+     priority.  */
+  while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0))
+    {
+      /* This thread has to wait for a while.  Enqueue it among the
+	 waiting_readers.  */
+      if (pthread_cond_wait (&lock->waiting_readers, &lock->lock) != 0)
+	abort ();
+    }
+  lock->runcount++;
+  if (pthread_mutex_unlock (&lock->lock) != 0)
+    abort ();
+}
+
+void
+glthread_rwlock_wrlock (gl_rwlock_t *lock)
+{
+  if (pthread_mutex_lock (&lock->lock) != 0)
+    abort ();
+  /* Test whether no readers or writers are currently running.  */
+  while (!(lock->runcount == 0))
+    {
+      /* This thread has to wait for a while.  Enqueue it among the
+	 waiting_writers.  */
+      lock->waiting_writers_count++;
+      if (pthread_cond_wait (&lock->waiting_writers, &lock->lock) != 0)
+	abort ();
+      lock->waiting_writers_count--;
+    }
+  lock->runcount--; /* runcount becomes -1 */
+  if (pthread_mutex_unlock (&lock->lock) != 0)
+    abort ();
+}
+
+void
+glthread_rwlock_unlock (gl_rwlock_t *lock)
+{
+  if (pthread_mutex_lock (&lock->lock) != 0)
+    abort ();
+  if (lock->runcount < 0)
+    {
+      /* Drop a writer lock.  */
+      if (!(lock->runcount == -1))
+	abort ();
+      lock->runcount = 0;
+    }
+  else
+    {
+      /* Drop a reader lock.  */
+      if (!(lock->runcount > 0))
+	abort ();
+      lock->runcount--;
+    }
+  if (lock->runcount == 0)
+    {
+      /* POSIX recommends that "write locks shall take precedence over read
+	 locks", to avoid "writer starvation".  */
+      if (lock->waiting_writers_count > 0)
+	{
+	  /* Wake up one of the waiting writers.  */
+	  if (pthread_cond_signal (&lock->waiting_writers) != 0)
+	    abort ();
+	}
+      else
+	{
+	  /* Wake up all waiting readers.  */
+	  if (pthread_cond_broadcast (&lock->waiting_readers) != 0)
+	    abort ();
+	}
+    }
+  if (pthread_mutex_unlock (&lock->lock) != 0)
+    abort ();
+}
+
+void
+glthread_rwlock_destroy (gl_rwlock_t *lock)
+{
+  if (pthread_mutex_destroy (&lock->lock) != 0)
+    abort ();
+  if (pthread_cond_destroy (&lock->waiting_readers) != 0)
+    abort ();
+  if (pthread_cond_destroy (&lock->waiting_writers) != 0)
+    abort ();
+}
+
+# endif
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+# if HAVE_PTHREAD_MUTEX_RECURSIVE
+
+#  if !(defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER || defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
+
+void
+glthread_recursive_lock_init (gl_recursive_lock_t *lock)
+{
+  pthread_mutexattr_t attributes;
+
+  if (pthread_mutexattr_init (&attributes) != 0)
+    abort ();
+  if (pthread_mutexattr_settype (&attributes, PTHREAD_MUTEX_RECURSIVE) != 0)
+    abort ();
+  if (pthread_mutex_init (&lock->recmutex, &attributes) != 0)
+    abort ();
+  if (pthread_mutexattr_destroy (&attributes) != 0)
+    abort ();
+  lock->initialized = 1;
+}
+
+void
+glthread_recursive_lock_lock (gl_recursive_lock_t *lock)
+{
+  if (!lock->initialized)
+    {
+      if (pthread_mutex_lock (&lock->guard) != 0)
+	abort ();
+      if (!lock->initialized)
+	glthread_recursive_lock_init (lock);
+      if (pthread_mutex_unlock (&lock->guard) != 0)
+	abort ();
+    }
+  if (pthread_mutex_lock (&lock->recmutex) != 0)
+    abort ();
+}
+
+void
+glthread_recursive_lock_unlock (gl_recursive_lock_t *lock)
+{
+  if (!lock->initialized)
+    abort ();
+  if (pthread_mutex_unlock (&lock->recmutex) != 0)
+    abort ();
+}
+
+void
+glthread_recursive_lock_destroy (gl_recursive_lock_t *lock)
+{
+  if (!lock->initialized)
+    abort ();
+  if (pthread_mutex_destroy (&lock->recmutex) != 0)
+    abort ();
+  lock->initialized = 0;
+}
+
+#  endif
+
+# else
+
+void
+glthread_recursive_lock_init (gl_recursive_lock_t *lock)
+{
+  if (pthread_mutex_init (&lock->mutex, NULL) != 0)
+    abort ();
+  lock->owner = (pthread_t) 0;
+  lock->depth = 0;
+}
+
+void
+glthread_recursive_lock_lock (gl_recursive_lock_t *lock)
+{
+  pthread_t self = pthread_self ();
+  if (lock->owner != self)
+    {
+      if (pthread_mutex_lock (&lock->mutex) != 0)
+	abort ();
+      lock->owner = self;
+    }
+  if (++(lock->depth) == 0) /* wraparound? */
+    abort ();
+}
+
+void
+glthread_recursive_lock_unlock (gl_recursive_lock_t *lock)
+{
+  if (lock->owner != pthread_self ())
+    abort ();
+  if (lock->depth == 0)
+    abort ();
+  if (--(lock->depth) == 0)
+    {
+      lock->owner = (pthread_t) 0;
+      if (pthread_mutex_unlock (&lock->mutex) != 0)
+	abort ();
+    }
+}
+
+void
+glthread_recursive_lock_destroy (gl_recursive_lock_t *lock)
+{
+  if (lock->owner != (pthread_t) 0)
+    abort ();
+  if (pthread_mutex_destroy (&lock->mutex) != 0)
+    abort ();
+}
+
+# endif
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+static const pthread_once_t fresh_once = PTHREAD_ONCE_INIT;
+
+int
+glthread_once_singlethreaded (pthread_once_t *once_control)
+{
+  /* We don't know whether pthread_once_t is an integer type, a floating-point
+     type, a pointer type, or a structure type.  */
+  char *firstbyte = (char *)once_control;
+  if (*firstbyte == *(const char *)&fresh_once)
+    {
+      /* First time use of once_control.  Invert the first byte.  */
+      *firstbyte = ~ *(const char *)&fresh_once;
+      return 1;
+    }
+  else
+    return 0;
+}
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_PTH_THREADS
+
+/* Use the GNU Pth threads library.  */
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+void
+glthread_once_call (void *arg)
+{
+  void (**gl_once_temp_addr) (void) = (void (**) (void)) arg;
+  void (*initfunction) (void) = *gl_once_temp_addr;
+  initfunction ();
+}
+
+int
+glthread_once_singlethreaded (pth_once_t *once_control)
+{
+  /* We know that pth_once_t is an integer type.  */
+  if (*once_control == PTH_ONCE_INIT)
+    {
+      /* First time use of once_control.  Invert the marker.  */
+      *once_control = ~ PTH_ONCE_INIT;
+      return 1;
+    }
+  else
+    return 0;
+}
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_SOLARIS_THREADS
+
+/* Use the old Solaris threads library.  */
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+void
+glthread_recursive_lock_init (gl_recursive_lock_t *lock)
+{
+  if (mutex_init (&lock->mutex, USYNC_THREAD, NULL) != 0)
+    abort ();
+  lock->owner = (thread_t) 0;
+  lock->depth = 0;
+}
+
+void
+glthread_recursive_lock_lock (gl_recursive_lock_t *lock)
+{
+  thread_t self = thr_self ();
+  if (lock->owner != self)
+    {
+      if (mutex_lock (&lock->mutex) != 0)
+	abort ();
+      lock->owner = self;
+    }
+  if (++(lock->depth) == 0) /* wraparound? */
+    abort ();
+}
+
+void
+glthread_recursive_lock_unlock (gl_recursive_lock_t *lock)
+{
+  if (lock->owner != thr_self ())
+    abort ();
+  if (lock->depth == 0)
+    abort ();
+  if (--(lock->depth) == 0)
+    {
+      lock->owner = (thread_t) 0;
+      if (mutex_unlock (&lock->mutex) != 0)
+	abort ();
+    }
+}
+
+void
+glthread_recursive_lock_destroy (gl_recursive_lock_t *lock)
+{
+  if (lock->owner != (thread_t) 0)
+    abort ();
+  if (mutex_destroy (&lock->mutex) != 0)
+    abort ();
+}
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+void
+glthread_once (gl_once_t *once_control, void (*initfunction) (void))
+{
+  if (!once_control->inited)
+    {
+      /* Use the mutex to guarantee that if another thread is already calling
+	 the initfunction, this thread waits until it's finished.  */
+      if (mutex_lock (&once_control->mutex) != 0)
+	abort ();
+      if (!once_control->inited)
+	{
+	  once_control->inited = 1;
+	  initfunction ();
+	}
+      if (mutex_unlock (&once_control->mutex) != 0)
+	abort ();
+    }
+}
+
+int
+glthread_once_singlethreaded (gl_once_t *once_control)
+{
+  /* We know that gl_once_t contains an integer type.  */
+  if (!once_control->inited)
+    {
+      /* First time use of once_control.  Invert the marker.  */
+      once_control->inited = ~ 0;
+      return 1;
+    }
+  else
+    return 0;
+}
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_WIN32_THREADS
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+void
+glthread_lock_init (gl_lock_t *lock)
+{
+  InitializeCriticalSection (&lock->lock);
+  lock->guard.done = 1;
+}
+
+void
+glthread_lock_lock (gl_lock_t *lock)
+{
+  if (!lock->guard.done)
+    {
+      if (InterlockedIncrement (&lock->guard.started) == 0)
+	/* This thread is the first one to need this lock.  Initialize it.  */
+	glthread_lock_init (lock);
+      else
+	/* Yield the CPU while waiting for another thread to finish
+	   initializing this lock.  */
+	while (!lock->guard.done)
+	  Sleep (0);
+    }
+  EnterCriticalSection (&lock->lock);
+}
+
+void
+glthread_lock_unlock (gl_lock_t *lock)
+{
+  if (!lock->guard.done)
+    abort ();
+  LeaveCriticalSection (&lock->lock);
+}
+
+void
+glthread_lock_destroy (gl_lock_t *lock)
+{
+  if (!lock->guard.done)
+    abort ();
+  DeleteCriticalSection (&lock->lock);
+  lock->guard.done = 0;
+}
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+static inline void
+gl_waitqueue_init (gl_waitqueue_t *wq)
+{
+  wq->array = NULL;
+  wq->count = 0;
+  wq->alloc = 0;
+  wq->offset = 0;
+}
+
+/* Enqueues the current thread, represented by an event, in a wait queue.
+   Returns INVALID_HANDLE_VALUE if an allocation failure occurs.  */
+static HANDLE
+gl_waitqueue_add (gl_waitqueue_t *wq)
+{
+  HANDLE event;
+  unsigned int index;
+
+  if (wq->count == wq->alloc)
+    {
+      unsigned int new_alloc = 2 * wq->alloc + 1;
+      HANDLE *new_array =
+	(HANDLE *) realloc (wq->array, new_alloc * sizeof (HANDLE));
+      if (new_array == NULL)
+	/* No more memory.  */
+	return INVALID_HANDLE_VALUE;
+      /* Now is a good opportunity to rotate the array so that its contents
+	 starts at offset 0.  */
+      if (wq->offset > 0)
+	{
+	  unsigned int old_count = wq->count;
+	  unsigned int old_alloc = wq->alloc;
+	  unsigned int old_offset = wq->offset;
+	  unsigned int i;
+	  if (old_offset + old_count > old_alloc)
+	    {
+	      unsigned int limit = old_offset + old_count - old_alloc;
+	      for (i = 0; i < limit; i++)
+		new_array[old_alloc + i] = new_array[i];
+	    }
+	  for (i = 0; i < old_count; i++)
+	    new_array[i] = new_array[old_offset + i];
+	  wq->offset = 0;
+	}
+      wq->array = new_array;
+      wq->alloc = new_alloc;
+    }
+  event = CreateEvent (NULL, TRUE, FALSE, NULL);
+  if (event == INVALID_HANDLE_VALUE)
+    /* No way to allocate an event.  */
+    return INVALID_HANDLE_VALUE;
+  index = wq->offset + wq->count;
+  if (index >= wq->alloc)
+    index -= wq->alloc;
+  wq->array[index] = event;
+  wq->count++;
+  return event;
+}
+
+/* Notifies the first thread from a wait queue and dequeues it.  */
+static inline void
+gl_waitqueue_notify_first (gl_waitqueue_t *wq)
+{
+  SetEvent (wq->array[wq->offset + 0]);
+  wq->offset++;
+  wq->count--;
+  if (wq->count == 0 || wq->offset == wq->alloc)
+    wq->offset = 0;
+}
+
+/* Notifies all threads from a wait queue and dequeues them all.  */
+static inline void
+gl_waitqueue_notify_all (gl_waitqueue_t *wq)
+{
+  unsigned int i;
+
+  for (i = 0; i < wq->count; i++)
+    {
+      unsigned int index = wq->offset + i;
+      if (index >= wq->alloc)
+	index -= wq->alloc;
+      SetEvent (wq->array[index]);
+    }
+  wq->count = 0;
+  wq->offset = 0;
+}
+
+void
+glthread_rwlock_init (gl_rwlock_t *lock)
+{
+  InitializeCriticalSection (&lock->lock);
+  gl_waitqueue_init (&lock->waiting_readers);
+  gl_waitqueue_init (&lock->waiting_writers);
+  lock->runcount = 0;
+  lock->guard.done = 1;
+}
+
+void
+glthread_rwlock_rdlock (gl_rwlock_t *lock)
+{
+  if (!lock->guard.done)
+    {
+      if (InterlockedIncrement (&lock->guard.started) == 0)
+	/* This thread is the first one to need this lock.  Initialize it.  */
+	glthread_rwlock_init (lock);
+      else
+	/* Yield the CPU while waiting for another thread to finish
+	   initializing this lock.  */
+	while (!lock->guard.done)
+	  Sleep (0);
+    }
+  EnterCriticalSection (&lock->lock);
+  /* Test whether only readers are currently running, and whether the runcount
+     field will not overflow.  */
+  if (!(lock->runcount + 1 > 0))
+    {
+      /* This thread has to wait for a while.  Enqueue it among the
+	 waiting_readers.  */
+      HANDLE event = gl_waitqueue_add (&lock->waiting_readers);
+      if (event != INVALID_HANDLE_VALUE)
+	{
+	  DWORD result;
+	  LeaveCriticalSection (&lock->lock);
+	  /* Wait until another thread signals this event.  */
+	  result = WaitForSingleObject (event, INFINITE);
+	  if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
+	    abort ();
+	  CloseHandle (event);
+	  /* The thread which signalled the event already did the bookkeeping:
+	     removed us from the waiting_readers, incremented lock->runcount.  */
+	  if (!(lock->runcount > 0))
+	    abort ();
+	  return;
+	}
+      else
+	{
+	  /* Allocation failure.  Weird.  */
+	  do
+	    {
+	      LeaveCriticalSection (&lock->lock);
+	      Sleep (1);
+	      EnterCriticalSection (&lock->lock);
+	    }
+	  while (!(lock->runcount + 1 > 0));
+	}
+    }
+  lock->runcount++;
+  LeaveCriticalSection (&lock->lock);
+}
+
+void
+glthread_rwlock_wrlock (gl_rwlock_t *lock)
+{
+  if (!lock->guard.done)
+    {
+      if (InterlockedIncrement (&lock->guard.started) == 0)
+	/* This thread is the first one to need this lock.  Initialize it.  */
+	glthread_rwlock_init (lock);
+      else
+	/* Yield the CPU while waiting for another thread to finish
+	   initializing this lock.  */
+	while (!lock->guard.done)
+	  Sleep (0);
+    }
+  EnterCriticalSection (&lock->lock);
+  /* Test whether no readers or writers are currently running.  */
+  if (!(lock->runcount == 0))
+    {
+      /* This thread has to wait for a while.  Enqueue it among the
+	 waiting_writers.  */
+      HANDLE event = gl_waitqueue_add (&lock->waiting_writers);
+      if (event != INVALID_HANDLE_VALUE)
+	{
+	  DWORD result;
+	  LeaveCriticalSection (&lock->lock);
+	  /* Wait until another thread signals this event.  */
+	  result = WaitForSingleObject (event, INFINITE);
+	  if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
+	    abort ();
+	  CloseHandle (event);
+	  /* The thread which signalled the event already did the bookkeeping:
+	     removed us from the waiting_writers, set lock->runcount = -1.  */
+	  if (!(lock->runcount == -1))
+	    abort ();
+	  return;
+	}
+      else
+	{
+	  /* Allocation failure.  Weird.  */
+	  do
+	    {
+	      LeaveCriticalSection (&lock->lock);
+	      Sleep (1);
+	      EnterCriticalSection (&lock->lock);
+	    }
+	  while (!(lock->runcount == 0));
+	}
+    }
+  lock->runcount--; /* runcount becomes -1 */
+  LeaveCriticalSection (&lock->lock);
+}
+
+void
+glthread_rwlock_unlock (gl_rwlock_t *lock)
+{
+  if (!lock->guard.done)
+    abort ();
+  EnterCriticalSection (&lock->lock);
+  if (lock->runcount < 0)
+    {
+      /* Drop a writer lock.  */
+      if (!(lock->runcount == -1))
+	abort ();
+      lock->runcount = 0;
+    }
+  else
+    {
+      /* Drop a reader lock.  */
+      if (!(lock->runcount > 0))
+	abort ();
+      lock->runcount--;
+    }
+  if (lock->runcount == 0)
+    {
+      /* POSIX recommends that "write locks shall take precedence over read
+	 locks", to avoid "writer starvation".  */
+      if (lock->waiting_writers.count > 0)
+	{
+	  /* Wake up one of the waiting writers.  */
+	  lock->runcount--;
+	  gl_waitqueue_notify_first (&lock->waiting_writers);
+	}
+      else
+	{
+	  /* Wake up all waiting readers.  */
+	  lock->runcount += lock->waiting_readers.count;
+	  gl_waitqueue_notify_all (&lock->waiting_readers);
+	}
+    }
+  LeaveCriticalSection (&lock->lock);
+}
+
+void
+glthread_rwlock_destroy (gl_rwlock_t *lock)
+{
+  if (!lock->guard.done)
+    abort ();
+  if (lock->runcount != 0)
+    abort ();
+  DeleteCriticalSection (&lock->lock);
+  if (lock->waiting_readers.array != NULL)
+    free (lock->waiting_readers.array);
+  if (lock->waiting_writers.array != NULL)
+    free (lock->waiting_writers.array);
+  lock->guard.done = 0;
+}
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+void
+glthread_recursive_lock_init (gl_recursive_lock_t *lock)
+{
+  lock->owner = 0;
+  lock->depth = 0;
+  InitializeCriticalSection (&lock->lock);
+  lock->guard.done = 1;
+}
+
+void
+glthread_recursive_lock_lock (gl_recursive_lock_t *lock)
+{
+  if (!lock->guard.done)
+    {
+      if (InterlockedIncrement (&lock->guard.started) == 0)
+	/* This thread is the first one to need this lock.  Initialize it.  */
+	glthread_recursive_lock_init (lock);
+      else
+	/* Yield the CPU while waiting for another thread to finish
+	   initializing this lock.  */
+	while (!lock->guard.done)
+	  Sleep (0);
+    }
+  {
+    DWORD self = GetCurrentThreadId ();
+    if (lock->owner != self)
+      {
+	EnterCriticalSection (&lock->lock);
+	lock->owner = self;
+      }
+    if (++(lock->depth) == 0) /* wraparound? */
+      abort ();
+  }
+}
+
+void
+glthread_recursive_lock_unlock (gl_recursive_lock_t *lock)
+{
+  if (lock->owner != GetCurrentThreadId ())
+    abort ();
+  if (lock->depth == 0)
+    abort ();
+  if (--(lock->depth) == 0)
+    {
+      lock->owner = 0;
+      LeaveCriticalSection (&lock->lock);
+    }
+}
+
+void
+glthread_recursive_lock_destroy (gl_recursive_lock_t *lock)
+{
+  if (lock->owner != 0)
+    abort ();
+  DeleteCriticalSection (&lock->lock);
+  lock->guard.done = 0;
+}
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+void
+glthread_once (gl_once_t *once_control, void (*initfunction) (void))
+{
+  if (once_control->inited <= 0)
+    {
+      if (InterlockedIncrement (&once_control->started) == 0)
+	{
+	  /* This thread is the first one to come to this once_control.  */
+	  InitializeCriticalSection (&once_control->lock);
+	  EnterCriticalSection (&once_control->lock);
+	  once_control->inited = 0;
+	  initfunction ();
+	  once_control->inited = 1;
+	  LeaveCriticalSection (&once_control->lock);
+	}
+      else
+	{
+	  /* Undo last operation.  */
+	  InterlockedDecrement (&once_control->started);
+	  /* Some other thread has already started the initialization.
+	     Yield the CPU while waiting for the other thread to finish
+	     initializing and taking the lock.  */
+	  while (once_control->inited < 0)
+	    Sleep (0);
+	  if (once_control->inited <= 0)
+	    {
+	      /* Take the lock.  This blocks until the other thread has
+		 finished calling the initfunction.  */
+	      EnterCriticalSection (&once_control->lock);
+	      LeaveCriticalSection (&once_control->lock);
+	      if (!(once_control->inited > 0))
+		abort ();
+	    }
+	}
+    }
+}
+
+#endif
+
+/* ========================================================================= */
diff --git a/intl/lock.h b/intl/lock.h
new file mode 100644
index 000000000..04d136922
--- /dev/null
+++ b/intl/lock.h
@@ -0,0 +1,833 @@
+/* Locking in multithreaded situations.
+   Copyright (C) 2005-2006 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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.  */
+
+/* Written by Bruno Haible <[email protected]>, 2005.
+   Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
+   gthr-win32.h.  */
+
+/* This file contains locking primitives for use with a given thread library.
+   It does not contain primitives for creating threads or for other
+   synchronization primitives.
+
+   Normal (non-recursive) locks:
+     Type:                gl_lock_t
+     Declaration:         gl_lock_define(extern, name)
+     Initializer:         gl_lock_define_initialized(, name)
+     Initialization:      gl_lock_init (name);
+     Taking the lock:     gl_lock_lock (name);
+     Releasing the lock:  gl_lock_unlock (name);
+     De-initialization:   gl_lock_destroy (name);
+
+   Read-Write (non-recursive) locks:
+     Type:                gl_rwlock_t
+     Declaration:         gl_rwlock_define(extern, name)
+     Initializer:         gl_rwlock_define_initialized(, name)
+     Initialization:      gl_rwlock_init (name);
+     Taking the lock:     gl_rwlock_rdlock (name);
+                          gl_rwlock_wrlock (name);
+     Releasing the lock:  gl_rwlock_unlock (name);
+     De-initialization:   gl_rwlock_destroy (name);
+
+   Recursive locks:
+     Type:                gl_recursive_lock_t
+     Declaration:         gl_recursive_lock_define(extern, name)
+     Initializer:         gl_recursive_lock_define_initialized(, name)
+     Initialization:      gl_recursive_lock_init (name);
+     Taking the lock:     gl_recursive_lock_lock (name);
+     Releasing the lock:  gl_recursive_lock_unlock (name);
+     De-initialization:   gl_recursive_lock_destroy (name);
+
+  Once-only execution:
+     Type:                gl_once_t
+     Initializer:         gl_once_define(extern, name)
+     Execution:           gl_once (name, initfunction);
+*/
+
+
+#ifndef _LOCK_H
+#define _LOCK_H
+
+/* ========================================================================= */
+
+#if USE_POSIX_THREADS
+
+/* Use the POSIX threads library.  */
+
+# include <pthread.h>
+# include <stdlib.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# if PTHREAD_IN_USE_DETECTION_HARD
+
+/* The pthread_in_use() detection needs to be done at runtime.  */
+#  define pthread_in_use() \
+     glthread_in_use ()
+extern int glthread_in_use (void);
+
+# endif
+
+# if USE_POSIX_THREADS_WEAK
+
+/* Use weak references to the POSIX threads library.  */
+
+/* Weak references avoid dragging in external libraries if the other parts
+   of the program don't use them.  Here we use them, because we don't want
+   every program that uses libintl to depend on libpthread.  This assumes
+   that libpthread would not be loaded after libintl; i.e. if libintl is
+   loaded first, by an executable that does not depend on libpthread, and
+   then a module is dynamically loaded that depends on libpthread, libintl
+   will not be multithread-safe.  */
+
+/* The way to test at runtime whether libpthread is present is to test
+   whether a function pointer's value, such as &pthread_mutex_init, is
+   non-NULL.  However, some versions of GCC have a bug through which, in
+   PIC mode, &foo != NULL always evaluates to true if there is a direct
+   call to foo(...) in the same function.  To avoid this, we test the
+   address of a function in libpthread that we don't use.  */
+
+#  pragma weak pthread_mutex_init
+#  pragma weak pthread_mutex_lock
+#  pragma weak pthread_mutex_unlock
+#  pragma weak pthread_mutex_destroy
+#  pragma weak pthread_rwlock_init
+#  pragma weak pthread_rwlock_rdlock
+#  pragma weak pthread_rwlock_wrlock
+#  pragma weak pthread_rwlock_unlock
+#  pragma weak pthread_rwlock_destroy
+#  pragma weak pthread_once
+#  pragma weak pthread_cond_init
+#  pragma weak pthread_cond_wait
+#  pragma weak pthread_cond_signal
+#  pragma weak pthread_cond_broadcast
+#  pragma weak pthread_cond_destroy
+#  pragma weak pthread_mutexattr_init
+#  pragma weak pthread_mutexattr_settype
+#  pragma weak pthread_mutexattr_destroy
+#  ifndef pthread_self
+#   pragma weak pthread_self
+#  endif
+
+#  if !PTHREAD_IN_USE_DETECTION_HARD
+#   pragma weak pthread_cancel
+#   define pthread_in_use() (pthread_cancel != NULL)
+#  endif
+
+# else
+
+#  if !PTHREAD_IN_USE_DETECTION_HARD
+#   define pthread_in_use() 1
+#  endif
+
+# endif
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+typedef pthread_mutex_t gl_lock_t;
+# define gl_lock_define(STORAGECLASS, NAME) \
+    STORAGECLASS pthread_mutex_t NAME;
+# define gl_lock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS pthread_mutex_t NAME = gl_lock_initializer;
+# define gl_lock_initializer \
+    PTHREAD_MUTEX_INITIALIZER
+# define gl_lock_init(NAME) \
+    if (pthread_in_use () && pthread_mutex_init (&NAME, NULL) != 0) abort ()
+# define gl_lock_lock(NAME) \
+    if (pthread_in_use () && pthread_mutex_lock (&NAME) != 0) abort ()
+# define gl_lock_unlock(NAME) \
+    if (pthread_in_use () && pthread_mutex_unlock (&NAME) != 0) abort ()
+# define gl_lock_destroy(NAME) \
+    if (pthread_in_use () && pthread_mutex_destroy (&NAME) != 0) abort ()
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+# if HAVE_PTHREAD_RWLOCK
+
+#  ifdef PTHREAD_RWLOCK_INITIALIZER
+
+typedef pthread_rwlock_t gl_rwlock_t;
+#   define gl_rwlock_define(STORAGECLASS, NAME) \
+      STORAGECLASS pthread_rwlock_t NAME;
+#   define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+      STORAGECLASS pthread_rwlock_t NAME = gl_rwlock_initializer;
+#   define gl_rwlock_initializer \
+      PTHREAD_RWLOCK_INITIALIZER
+#   define gl_rwlock_init(NAME) \
+      if (pthread_in_use () && pthread_rwlock_init (&NAME, NULL) != 0) abort ()
+#   define gl_rwlock_rdlock(NAME) \
+      if (pthread_in_use () && pthread_rwlock_rdlock (&NAME) != 0) abort ()
+#   define gl_rwlock_wrlock(NAME) \
+      if (pthread_in_use () && pthread_rwlock_wrlock (&NAME) != 0) abort ()
+#   define gl_rwlock_unlock(NAME) \
+      if (pthread_in_use () && pthread_rwlock_unlock (&NAME) != 0) abort ()
+#   define gl_rwlock_destroy(NAME) \
+      if (pthread_in_use () && pthread_rwlock_destroy (&NAME) != 0) abort ()
+
+#  else
+
+typedef struct
+        {
+          int initialized;
+          pthread_mutex_t guard;   /* protects the initialization */
+          pthread_rwlock_t rwlock; /* read-write lock */
+        }
+        gl_rwlock_t;
+#   define gl_rwlock_define(STORAGECLASS, NAME) \
+      STORAGECLASS gl_rwlock_t NAME;
+#   define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+      STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
+#   define gl_rwlock_initializer \
+      { 0, PTHREAD_MUTEX_INITIALIZER }
+#   define gl_rwlock_init(NAME) \
+      if (pthread_in_use ()) glthread_rwlock_init (&NAME)
+#   define gl_rwlock_rdlock(NAME) \
+      if (pthread_in_use ()) glthread_rwlock_rdlock (&NAME)
+#   define gl_rwlock_wrlock(NAME) \
+      if (pthread_in_use ()) glthread_rwlock_wrlock (&NAME)
+#   define gl_rwlock_unlock(NAME) \
+      if (pthread_in_use ()) glthread_rwlock_unlock (&NAME)
+#   define gl_rwlock_destroy(NAME) \
+      if (pthread_in_use ()) glthread_rwlock_destroy (&NAME)
+extern void glthread_rwlock_init (gl_rwlock_t *lock);
+extern void glthread_rwlock_rdlock (gl_rwlock_t *lock);
+extern void glthread_rwlock_wrlock (gl_rwlock_t *lock);
+extern void glthread_rwlock_unlock (gl_rwlock_t *lock);
+extern void glthread_rwlock_destroy (gl_rwlock_t *lock);
+
+#  endif
+
+# else
+
+typedef struct
+        {
+          pthread_mutex_t lock; /* protects the remaining fields */
+          pthread_cond_t waiting_readers; /* waiting readers */
+          pthread_cond_t waiting_writers; /* waiting writers */
+          unsigned int waiting_writers_count; /* number of waiting writers */
+          int runcount; /* number of readers running, or -1 when a writer runs */
+        }
+        gl_rwlock_t;
+# define gl_rwlock_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_rwlock_t NAME;
+# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
+# define gl_rwlock_initializer \
+    { PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, 0 }
+# define gl_rwlock_init(NAME) \
+    if (pthread_in_use ()) glthread_rwlock_init (&NAME)
+# define gl_rwlock_rdlock(NAME) \
+    if (pthread_in_use ()) glthread_rwlock_rdlock (&NAME)
+# define gl_rwlock_wrlock(NAME) \
+    if (pthread_in_use ()) glthread_rwlock_wrlock (&NAME)
+# define gl_rwlock_unlock(NAME) \
+    if (pthread_in_use ()) glthread_rwlock_unlock (&NAME)
+# define gl_rwlock_destroy(NAME) \
+    if (pthread_in_use ()) glthread_rwlock_destroy (&NAME)
+extern void glthread_rwlock_init (gl_rwlock_t *lock);
+extern void glthread_rwlock_rdlock (gl_rwlock_t *lock);
+extern void glthread_rwlock_wrlock (gl_rwlock_t *lock);
+extern void glthread_rwlock_unlock (gl_rwlock_t *lock);
+extern void glthread_rwlock_destroy (gl_rwlock_t *lock);
+
+# endif
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+# if HAVE_PTHREAD_MUTEX_RECURSIVE
+
+#  if defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER || defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+
+typedef pthread_mutex_t gl_recursive_lock_t;
+#   define gl_recursive_lock_define(STORAGECLASS, NAME) \
+      STORAGECLASS pthread_mutex_t NAME;
+#   define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
+      STORAGECLASS pthread_mutex_t NAME = gl_recursive_lock_initializer;
+#   ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER
+#    define gl_recursive_lock_initializer \
+       PTHREAD_RECURSIVE_MUTEX_INITIALIZER
+#   else
+#    define gl_recursive_lock_initializer \
+       PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+#   endif
+#   define gl_recursive_lock_init(NAME) \
+      if (pthread_in_use () && pthread_mutex_init (&NAME, NULL) != 0) abort ()
+#   define gl_recursive_lock_lock(NAME) \
+      if (pthread_in_use () && pthread_mutex_lock (&NAME) != 0) abort ()
+#   define gl_recursive_lock_unlock(NAME) \
+      if (pthread_in_use () && pthread_mutex_unlock (&NAME) != 0) abort ()
+#   define gl_recursive_lock_destroy(NAME) \
+      if (pthread_in_use () && pthread_mutex_destroy (&NAME) != 0) abort ()
+
+#  else
+
+typedef struct
+        {
+          pthread_mutex_t recmutex; /* recursive mutex */
+          pthread_mutex_t guard;    /* protects the initialization */
+          int initialized;
+        }
+        gl_recursive_lock_t;
+#   define gl_recursive_lock_define(STORAGECLASS, NAME) \
+      STORAGECLASS gl_recursive_lock_t NAME;
+#   define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
+      STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
+#   define gl_recursive_lock_initializer \
+      { PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, 0 }
+#   define gl_recursive_lock_init(NAME) \
+      if (pthread_in_use ()) glthread_recursive_lock_init (&NAME)
+#   define gl_recursive_lock_lock(NAME) \
+      if (pthread_in_use ()) glthread_recursive_lock_lock (&NAME)
+#   define gl_recursive_lock_unlock(NAME) \
+      if (pthread_in_use ()) glthread_recursive_lock_unlock (&NAME)
+#   define gl_recursive_lock_destroy(NAME) \
+      if (pthread_in_use ()) glthread_recursive_lock_destroy (&NAME)
+extern void glthread_recursive_lock_init (gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_lock (gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_unlock (gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_destroy (gl_recursive_lock_t *lock);
+
+#  endif
+
+# else
+
+/* Old versions of POSIX threads on Solaris did not have recursive locks.
+   We have to implement them ourselves.  */
+
+typedef struct
+        {
+          pthread_mutex_t mutex;
+          pthread_t owner;
+          unsigned long depth;
+        }
+        gl_recursive_lock_t;
+#  define gl_recursive_lock_define(STORAGECLASS, NAME) \
+     STORAGECLASS gl_recursive_lock_t NAME;
+#  define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
+     STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
+#  define gl_recursive_lock_initializer \
+     { PTHREAD_MUTEX_INITIALIZER, (pthread_t) 0, 0 }
+#  define gl_recursive_lock_init(NAME) \
+     if (pthread_in_use ()) glthread_recursive_lock_init (&NAME)
+#  define gl_recursive_lock_lock(NAME) \
+     if (pthread_in_use ()) glthread_recursive_lock_lock (&NAME)
+#  define gl_recursive_lock_unlock(NAME) \
+     if (pthread_in_use ()) glthread_recursive_lock_unlock (&NAME)
+#  define gl_recursive_lock_destroy(NAME) \
+     if (pthread_in_use ()) glthread_recursive_lock_destroy (&NAME)
+extern void glthread_recursive_lock_init (gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_lock (gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_unlock (gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_destroy (gl_recursive_lock_t *lock);
+
+# endif
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef pthread_once_t gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS pthread_once_t NAME = PTHREAD_ONCE_INIT;
+# define gl_once(NAME, INITFUNCTION) \
+    do                                                   \
+      {                                                  \
+        if (pthread_in_use ())                           \
+          {                                              \
+            if (pthread_once (&NAME, INITFUNCTION) != 0) \
+              abort ();                                  \
+          }                                              \
+        else                                             \
+          {                                              \
+            if (glthread_once_singlethreaded (&NAME))    \
+              INITFUNCTION ();                           \
+          }                                              \
+      }                                                  \
+    while (0)
+extern int glthread_once_singlethreaded (pthread_once_t *once_control);
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_PTH_THREADS
+
+/* Use the GNU Pth threads library.  */
+
+# include <pth.h>
+# include <stdlib.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# if USE_PTH_THREADS_WEAK
+
+/* Use weak references to the GNU Pth threads library.  */
+
+#  pragma weak pth_mutex_init
+#  pragma weak pth_mutex_acquire
+#  pragma weak pth_mutex_release
+#  pragma weak pth_rwlock_init
+#  pragma weak pth_rwlock_acquire
+#  pragma weak pth_rwlock_release
+#  pragma weak pth_once
+
+#  pragma weak pth_cancel
+#  define pth_in_use() (pth_cancel != NULL)
+
+# else
+
+#  define pth_in_use() 1
+
+# endif
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+typedef pth_mutex_t gl_lock_t;
+# define gl_lock_define(STORAGECLASS, NAME) \
+    STORAGECLASS pth_mutex_t NAME;
+# define gl_lock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS pth_mutex_t NAME = gl_lock_initializer;
+# define gl_lock_initializer \
+    PTH_MUTEX_INIT
+# define gl_lock_init(NAME) \
+    if (pth_in_use() && !pth_mutex_init (&NAME)) abort ()
+# define gl_lock_lock(NAME) \
+    if (pth_in_use() && !pth_mutex_acquire (&NAME, 0, NULL)) abort ()
+# define gl_lock_unlock(NAME) \
+    if (pth_in_use() && !pth_mutex_release (&NAME)) abort ()
+# define gl_lock_destroy(NAME) \
+    (void)(&NAME)
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+typedef pth_rwlock_t gl_rwlock_t;
+#  define gl_rwlock_define(STORAGECLASS, NAME) \
+     STORAGECLASS pth_rwlock_t NAME;
+#  define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+     STORAGECLASS pth_rwlock_t NAME = gl_rwlock_initializer;
+#  define gl_rwlock_initializer \
+     PTH_RWLOCK_INIT
+#  define gl_rwlock_init(NAME) \
+     if (pth_in_use() && !pth_rwlock_init (&NAME)) abort ()
+#  define gl_rwlock_rdlock(NAME) \
+     if (pth_in_use() && !pth_rwlock_acquire (&NAME, PTH_RWLOCK_RD, 0, NULL)) abort ()
+#  define gl_rwlock_wrlock(NAME) \
+     if (pth_in_use() && !pth_rwlock_acquire (&NAME, PTH_RWLOCK_RW, 0, NULL)) abort ()
+#  define gl_rwlock_unlock(NAME) \
+     if (pth_in_use() && !pth_rwlock_release (&NAME)) abort ()
+#  define gl_rwlock_destroy(NAME) \
+     (void)(&NAME)
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+/* In Pth, mutexes are recursive by default.  */
+typedef pth_mutex_t gl_recursive_lock_t;
+#  define gl_recursive_lock_define(STORAGECLASS, NAME) \
+     STORAGECLASS pth_mutex_t NAME;
+#  define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
+     STORAGECLASS pth_mutex_t NAME = gl_recursive_lock_initializer;
+#  define gl_recursive_lock_initializer \
+     PTH_MUTEX_INIT
+#  define gl_recursive_lock_init(NAME) \
+     if (pth_in_use() && !pth_mutex_init (&NAME)) abort ()
+#  define gl_recursive_lock_lock(NAME) \
+     if (pth_in_use() && !pth_mutex_acquire (&NAME, 0, NULL)) abort ()
+#  define gl_recursive_lock_unlock(NAME) \
+     if (pth_in_use() && !pth_mutex_release (&NAME)) abort ()
+#  define gl_recursive_lock_destroy(NAME) \
+     (void)(&NAME)
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef pth_once_t gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS pth_once_t NAME = PTH_ONCE_INIT;
+# define gl_once(NAME, INITFUNCTION) \
+    do                                                                \
+      {                                                               \
+        if (pth_in_use ())                                            \
+          {                                                           \
+            void (*gl_once_temp) (void) = INITFUNCTION;               \
+            if (!pth_once (&NAME, glthread_once_call, &gl_once_temp)) \
+              abort ();                                               \
+          }                                                           \
+        else                                                          \
+          {                                                           \
+            if (glthread_once_singlethreaded (&NAME))                 \
+              INITFUNCTION ();                                        \
+          }                                                           \
+      }                                                               \
+    while (0)
+extern void glthread_once_call (void *arg);
+extern int glthread_once_singlethreaded (pth_once_t *once_control);
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_SOLARIS_THREADS
+
+/* Use the old Solaris threads library.  */
+
+# include <thread.h>
+# include <synch.h>
+# include <stdlib.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# if USE_SOLARIS_THREADS_WEAK
+
+/* Use weak references to the old Solaris threads library.  */
+
+#  pragma weak mutex_init
+#  pragma weak mutex_lock
+#  pragma weak mutex_unlock
+#  pragma weak mutex_destroy
+#  pragma weak rwlock_init
+#  pragma weak rw_rdlock
+#  pragma weak rw_wrlock
+#  pragma weak rw_unlock
+#  pragma weak rwlock_destroy
+#  pragma weak thr_self
+
+#  pragma weak thr_suspend
+#  define thread_in_use() (thr_suspend != NULL)
+
+# else
+
+#  define thread_in_use() 1
+
+# endif
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+typedef mutex_t gl_lock_t;
+# define gl_lock_define(STORAGECLASS, NAME) \
+    STORAGECLASS mutex_t NAME;
+# define gl_lock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS mutex_t NAME = gl_lock_initializer;
+# define gl_lock_initializer \
+    DEFAULTMUTEX
+# define gl_lock_init(NAME) \
+    if (thread_in_use () && mutex_init (&NAME, USYNC_THREAD, NULL) != 0) abort ()
+# define gl_lock_lock(NAME) \
+    if (thread_in_use () && mutex_lock (&NAME) != 0) abort ()
+# define gl_lock_unlock(NAME) \
+    if (thread_in_use () && mutex_unlock (&NAME) != 0) abort ()
+# define gl_lock_destroy(NAME) \
+    if (thread_in_use () && mutex_destroy (&NAME) != 0) abort ()
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+typedef rwlock_t gl_rwlock_t;
+# define gl_rwlock_define(STORAGECLASS, NAME) \
+    STORAGECLASS rwlock_t NAME;
+# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS rwlock_t NAME = gl_rwlock_initializer;
+# define gl_rwlock_initializer \
+    DEFAULTRWLOCK
+# define gl_rwlock_init(NAME) \
+    if (thread_in_use () && rwlock_init (&NAME, USYNC_THREAD, NULL) != 0) abort ()
+# define gl_rwlock_rdlock(NAME) \
+    if (thread_in_use () && rw_rdlock (&NAME) != 0) abort ()
+# define gl_rwlock_wrlock(NAME) \
+    if (thread_in_use () && rw_wrlock (&NAME) != 0) abort ()
+# define gl_rwlock_unlock(NAME) \
+    if (thread_in_use () && rw_unlock (&NAME) != 0) abort ()
+# define gl_rwlock_destroy(NAME) \
+    if (thread_in_use () && rwlock_destroy (&NAME) != 0) abort ()
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+/* Old Solaris threads did not have recursive locks.
+   We have to implement them ourselves.  */
+
+typedef struct
+        {
+          mutex_t mutex;
+          thread_t owner;
+          unsigned long depth;
+        }
+        gl_recursive_lock_t;
+# define gl_recursive_lock_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_recursive_lock_t NAME;
+# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
+# define gl_recursive_lock_initializer \
+    { DEFAULTMUTEX, (thread_t) 0, 0 }
+# define gl_recursive_lock_init(NAME) \
+    if (thread_in_use ()) glthread_recursive_lock_init (&NAME)
+# define gl_recursive_lock_lock(NAME) \
+    if (thread_in_use ()) glthread_recursive_lock_lock (&NAME)
+# define gl_recursive_lock_unlock(NAME) \
+    if (thread_in_use ()) glthread_recursive_lock_unlock (&NAME)
+# define gl_recursive_lock_destroy(NAME) \
+    if (thread_in_use ()) glthread_recursive_lock_destroy (&NAME)
+extern void glthread_recursive_lock_init (gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_lock (gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_unlock (gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_destroy (gl_recursive_lock_t *lock);
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef struct
+        {
+          volatile int inited;
+          mutex_t mutex;
+        }
+        gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_once_t NAME = { 0, DEFAULTMUTEX };
+# define gl_once(NAME, INITFUNCTION) \
+    do                                                \
+      {                                               \
+        if (thread_in_use ())                         \
+          {                                           \
+            glthread_once (&NAME, INITFUNCTION);      \
+          }                                           \
+        else                                          \
+          {                                           \
+            if (glthread_once_singlethreaded (&NAME)) \
+              INITFUNCTION ();                        \
+          }                                           \
+      }                                               \
+    while (0)
+extern void glthread_once (gl_once_t *once_control, void (*initfunction) (void));
+extern int glthread_once_singlethreaded (gl_once_t *once_control);
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_WIN32_THREADS
+
+# include <windows.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+/* We can use CRITICAL_SECTION directly, rather than the Win32 Event, Mutex,
+   Semaphore types, because
+     - we need only to synchronize inside a single process (address space),
+       not inter-process locking,
+     - we don't need to support trylock operations.  (TryEnterCriticalSection
+       does not work on Windows 95/98/ME.  Packages that need trylock usually
+       define their own mutex type.)  */
+
+/* There is no way to statically initialize a CRITICAL_SECTION.  It needs
+   to be done lazily, once only.  For this we need spinlocks.  */
+
+typedef struct { volatile int done; volatile long started; } gl_spinlock_t;
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+typedef struct
+        {
+          gl_spinlock_t guard; /* protects the initialization */
+          CRITICAL_SECTION lock;
+        }
+        gl_lock_t;
+# define gl_lock_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_lock_t NAME;
+# define gl_lock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS gl_lock_t NAME = gl_lock_initializer;
+# define gl_lock_initializer \
+    { { 0, -1 } }
+# define gl_lock_init(NAME) \
+    glthread_lock_init (&NAME)
+# define gl_lock_lock(NAME) \
+    glthread_lock_lock (&NAME)
+# define gl_lock_unlock(NAME) \
+    glthread_lock_unlock (&NAME)
+# define gl_lock_destroy(NAME) \
+    glthread_lock_destroy (&NAME)
+extern void glthread_lock_init (gl_lock_t *lock);
+extern void glthread_lock_lock (gl_lock_t *lock);
+extern void glthread_lock_unlock (gl_lock_t *lock);
+extern void glthread_lock_destroy (gl_lock_t *lock);
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+/* It is impossible to implement read-write locks using plain locks, without
+   introducing an extra thread dedicated to managing read-write locks.
+   Therefore here we need to use the low-level Event type.  */
+
+typedef struct
+        {
+          HANDLE *array; /* array of waiting threads, each represented by an event */
+          unsigned int count; /* number of waiting threads */
+          unsigned int alloc; /* length of allocated array */
+          unsigned int offset; /* index of first waiting thread in array */
+        }
+        gl_waitqueue_t;
+typedef struct
+        {
+          gl_spinlock_t guard; /* protects the initialization */
+          CRITICAL_SECTION lock; /* protects the remaining fields */
+          gl_waitqueue_t waiting_readers; /* waiting readers */
+          gl_waitqueue_t waiting_writers; /* waiting writers */
+          int runcount; /* number of readers running, or -1 when a writer runs */
+        }
+        gl_rwlock_t;
+# define gl_rwlock_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_rwlock_t NAME;
+# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
+# define gl_rwlock_initializer \
+    { { 0, -1 } }
+# define gl_rwlock_init(NAME) \
+    glthread_rwlock_init (&NAME)
+# define gl_rwlock_rdlock(NAME) \
+    glthread_rwlock_rdlock (&NAME)
+# define gl_rwlock_wrlock(NAME) \
+    glthread_rwlock_wrlock (&NAME)
+# define gl_rwlock_unlock(NAME) \
+    glthread_rwlock_unlock (&NAME)
+# define gl_rwlock_destroy(NAME) \
+    glthread_rwlock_destroy (&NAME)
+extern void glthread_rwlock_init (gl_rwlock_t *lock);
+extern void glthread_rwlock_rdlock (gl_rwlock_t *lock);
+extern void glthread_rwlock_wrlock (gl_rwlock_t *lock);
+extern void glthread_rwlock_unlock (gl_rwlock_t *lock);
+extern void glthread_rwlock_destroy (gl_rwlock_t *lock);
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+/* The Win32 documentation says that CRITICAL_SECTION already implements a
+   recursive lock.  But we need not rely on it: It's easy to implement a
+   recursive lock without this assumption.  */
+
+typedef struct
+        {
+          gl_spinlock_t guard; /* protects the initialization */
+          DWORD owner;
+          unsigned long depth;
+          CRITICAL_SECTION lock;
+        }
+        gl_recursive_lock_t;
+# define gl_recursive_lock_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_recursive_lock_t NAME;
+# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
+# define gl_recursive_lock_initializer \
+    { { 0, -1 }, 0, 0 }
+# define gl_recursive_lock_init(NAME) \
+    glthread_recursive_lock_init (&NAME)
+# define gl_recursive_lock_lock(NAME) \
+    glthread_recursive_lock_lock (&NAME)
+# define gl_recursive_lock_unlock(NAME) \
+    glthread_recursive_lock_unlock (&NAME)
+# define gl_recursive_lock_destroy(NAME) \
+    glthread_recursive_lock_destroy (&NAME)
+extern void glthread_recursive_lock_init (gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_lock (gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_unlock (gl_recursive_lock_t *lock);
+extern void glthread_recursive_lock_destroy (gl_recursive_lock_t *lock);
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef struct
+        {
+          volatile int inited;
+          volatile long started;
+          CRITICAL_SECTION lock;
+        }
+        gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_once_t NAME = { -1, -1 };
+# define gl_once(NAME, INITFUNCTION) \
+    glthread_once (&NAME, INITFUNCTION)
+extern void glthread_once (gl_once_t *once_control, void (*initfunction) (void));
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS)
+
+/* Provide dummy implementation if threads are not supported.  */
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+typedef int gl_lock_t;
+# define gl_lock_define(STORAGECLASS, NAME)
+# define gl_lock_define_initialized(STORAGECLASS, NAME)
+# define gl_lock_init(NAME)
+# define gl_lock_lock(NAME)
+# define gl_lock_unlock(NAME)
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+typedef int gl_rwlock_t;
+# define gl_rwlock_define(STORAGECLASS, NAME)
+# define gl_rwlock_define_initialized(STORAGECLASS, NAME)
+# define gl_rwlock_init(NAME)
+# define gl_rwlock_rdlock(NAME)
+# define gl_rwlock_wrlock(NAME)
+# define gl_rwlock_unlock(NAME)
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+typedef int gl_recursive_lock_t;
+# define gl_recursive_lock_define(STORAGECLASS, NAME)
+# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME)
+# define gl_recursive_lock_init(NAME)
+# define gl_recursive_lock_lock(NAME)
+# define gl_recursive_lock_unlock(NAME)
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef int gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_once_t NAME = 0;
+# define gl_once(NAME, INITFUNCTION) \
+    do                       \
+      {                      \
+        if (NAME == 0)       \
+          {                  \
+            NAME = ~ 0;      \
+            INITFUNCTION (); \
+          }                  \
+      }                      \
+    while (0)
+
+#endif
+
+/* ========================================================================= */
+
+#endif /* _LOCK_H */
diff --git a/intl/log.c b/intl/log.c
index 89f82dfd1..e3ab5d0e6 100644
--- a/intl/log.c
+++ b/intl/log.c
@@ -1,5 +1,5 @@
 /* Log file output.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -26,6 +26,13 @@
 #include <stdlib.h>
 #include <string.h>
 
+/* Handle multi-threaded applications.  */
+#ifdef _LIBC
+# include <bits/libc-lock.h>
+#else
+# include "lock.h"
+#endif
+
 /* Print an ASCII string with quotes and escape sequences where needed.  */
 static void
 print_escaped (FILE *stream, const char *str)
@@ -48,13 +55,14 @@ print_escaped (FILE *stream, const char *str)
   putc ('"', stream);
 }
 
-/* Add to the log file an entry denoting a failed translation.  */
-void
-_nl_log_untranslated (const char *logfilename, const char *domainname,
-		      const char *msgid1, const char *msgid2, int plural)
+static char *last_logfilename = NULL;
+static FILE *last_logfile = NULL;
+__libc_lock_define_initialized (static, lock)
+
+static inline void
+_nl_log_untranslated_locked (const char *logfilename, const char *domainname,
+			     const char *msgid1, const char *msgid2, int plural)
 {
-  static char *last_logfilename = NULL;
-  static FILE *last_logfile = NULL;
   FILE *logfile;
 
   /* Can we reuse the last opened logfile?  */
@@ -96,3 +104,13 @@ _nl_log_untranslated (const char *logfilename, const char *domainname,
     fprintf (logfile, "\nmsgstr \"\"\n");
   putc ('\n', logfile);
 }
+
+/* Add to the log file an entry denoting a failed translation.  */
+void
+_nl_log_untranslated (const char *logfilename, const char *domainname,
+		      const char *msgid1, const char *msgid2, int plural)
+{
+  __libc_lock_lock (lock);
+  _nl_log_untranslated_locked (logfilename, domainname, msgid1, msgid2, plural);
+  __libc_lock_unlock (lock);
+}
diff --git a/intl/osdep.c b/intl/osdep.c
index d2d8575ec..3cc35c03b 100644
--- a/intl/osdep.c
+++ b/intl/osdep.c
@@ -1,5 +1,5 @@
 /* OS dependent parts of libintl.
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -16,7 +16,9 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
-#if defined __EMX__
+#if defined __CYGWIN__
+# include "intl-exports.c"
+#elif defined __EMX__
 # include "os2compat.c"
 #else
 /* Avoid AIX compiler warning.  */
diff --git a/intl/plural-exp.c b/intl/plural-exp.c
index 1873be90b..f518bf1dc 100644
--- a/intl/plural-exp.c
+++ b/intl/plural-exp.c
@@ -1,5 +1,5 @@
 /* Expression parsing for plural form selection.
-   Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2003, 2005 Free Software Foundation, Inc.
    Written by Ulrich Drepper <[email protected]>, 2000.
 
    This program is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
 
 #include "plural-exp.h"
 
-#if (defined __GNUC__ && !defined __APPLE_CC__) \
+#if (defined __GNUC__ && !(__APPLE_CC__ > 1)) \
     || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
 
 /* These structs are the constant expression for the germanic plural
diff --git a/intl/plural-exp.h b/intl/plural-exp.h
index f54018471..dc590d374 100644
--- a/intl/plural-exp.h
+++ b/intl/plural-exp.h
@@ -1,5 +1,5 @@
 /* Expression parsing and evaluation for plural form selection.
-   Copyright (C) 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2005 Free Software Foundation, Inc.
    Written by Ulrich Drepper <[email protected]>, 2000.
 
    This program is free software; you can redistribute it and/or modify it
@@ -110,7 +110,7 @@ extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
 				       unsigned long int *npluralsp)
      internal_function;
 
-#if !defined (_LIBC) && !defined (IN_LIBINTL)
+#if !defined (_LIBC) && !defined (IN_LIBINTL) && !defined (IN_LIBGLOCALE)
 extern unsigned long int plural_eval (struct expression *pexp,
 				      unsigned long int n);
 #endif
diff --git a/intl/plural.c b/intl/plural.c
index c73008b39..5f73b403f 100644
--- a/intl/plural.c
+++ b/intl/plural.c
@@ -19,7 +19,7 @@
 #line 1 "plural.y"
 
 /* Expression parsing for plural form selection.
-   Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2003, 2005 Free Software Foundation, Inc.
    Written by Ulrich Drepper <[email protected]>, 2000.
 
    This program is free software; you can redistribute it and/or modify it
@@ -37,10 +37,11 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
-/* The bison generated parser uses alloca.  AIX 3 forces us to put this
-   declaration at the beginning of the file.  The declaration in bison's
-   skeleton file comes too late.  This must come before <config.h>
-   because <config.h> may include arbitrary system headers.  */
+/* For bison < 2.0, the bison generated parser uses alloca.  AIX 3 forces us
+   to put this declaration at the beginning of the file.  The declaration in
+   bison's skeleton file comes too late.  This must come before <config.h>
+   because <config.h> may include arbitrary system headers.
+   This can go away once the AM_INTL_SUBDIR macro requires bison >= 2.0.  */
 #if defined _AIX && !defined __GNUC__
  #pragma alloca
 #endif
@@ -51,6 +52,7 @@
 
 #include <stddef.h>
 #include <stdlib.h>
+#include <string.h>
 #include "plural-exp.h"
 
 /* The main function generated by the parser is called __gettextparse,
@@ -62,7 +64,7 @@
 #define YYLEX_PARAM	&((struct parse_args *) arg)->cp
 #define YYPARSE_PARAM	arg
 
-#line 49 "plural.y"
+#line 51 "plural.y"
 #ifndef YYSTYPE
 typedef union {
   unsigned long int num;
@@ -72,7 +74,7 @@ typedef union {
 # define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
-#line 55 "plural.y"
+#line 57 "plural.y"
 
 /* Prototypes for local functions.  */
 static int yylex (YYSTYPE *lval, const char **pexp);
@@ -212,8 +214,8 @@ static const short yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
 static const short yyrline[] =
 {
-       0,   150,   158,   162,   166,   170,   174,   178,   182,   186,
-     190,   194,   199
+       0,   152,   160,   164,   168,   172,   176,   180,   184,   188,
+     192,   196,   201
 };
 #endif
 
@@ -296,7 +298,7 @@ static const short yycheck[] =
 #define YYPURE 1
 
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/local/share/bison/bison.simple"
+#line 3 "bison.simple"
 
 /* Skeleton output parser for bison,
 
@@ -315,8 +317,8 @@ static const short yycheck[] =
 
    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.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
@@ -609,7 +611,7 @@ yystpcpy (yydest, yysrc)
 # endif
 #endif
 
-#line 315 "/usr/local/share/bison/bison.simple"
+#line 315 "bison.simple"
 
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
@@ -1003,7 +1005,7 @@ yyreduce:
   switch (yyn) {
 
 case 1:
-#line 151 "plural.y"
+#line 153 "plural.y"
 {
 	    if (yyvsp[0].exp == NULL)
 	      YYABORT;
@@ -1011,75 +1013,75 @@ case 1:
 	  }
     break;
 case 2:
-#line 159 "plural.y"
+#line 161 "plural.y"
 {
 	    yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
 	  }
     break;
 case 3:
-#line 163 "plural.y"
+#line 165 "plural.y"
 {
 	    yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
 	  }
     break;
 case 4:
-#line 167 "plural.y"
+#line 169 "plural.y"
 {
 	    yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
 	  }
     break;
 case 5:
-#line 171 "plural.y"
+#line 173 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  }
     break;
 case 6:
-#line 175 "plural.y"
+#line 177 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  }
     break;
 case 7:
-#line 179 "plural.y"
+#line 181 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  }
     break;
 case 8:
-#line 183 "plural.y"
+#line 185 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  }
     break;
 case 9:
-#line 187 "plural.y"
+#line 189 "plural.y"
 {
 	    yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
 	  }
     break;
 case 10:
-#line 191 "plural.y"
+#line 193 "plural.y"
 {
 	    yyval.exp = new_exp_0 (var);
 	  }
     break;
 case 11:
-#line 195 "plural.y"
+#line 197 "plural.y"
 {
 	    if ((yyval.exp = new_exp_0 (num)) != NULL)
 	      yyval.exp->val.num = yyvsp[0].num;
 	  }
     break;
 case 12:
-#line 200 "plural.y"
+#line 202 "plural.y"
 {
 	    yyval.exp = yyvsp[-1].exp;
 	  }
     break;
 }
 
-#line 705 "/usr/local/share/bison/bison.simple"
+#line 705 "bison.simple"
 
 
   yyvsp -= yylen;
@@ -1310,7 +1312,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 205 "plural.y"
+#line 207 "plural.y"
 
 
 void
diff --git a/intl/plural.y b/intl/plural.y
index fe791120b..45d68e949 100644
--- a/intl/plural.y
+++ b/intl/plural.y
@@ -1,6 +1,6 @@
 %{
 /* Expression parsing for plural form selection.
-   Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2003, 2005 Free Software Foundation, Inc.
    Written by Ulrich Drepper <[email protected]>, 2000.
 
    This program is free software; you can redistribute it and/or modify it
@@ -18,10 +18,11 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
-/* The bison generated parser uses alloca.  AIX 3 forces us to put this
-   declaration at the beginning of the file.  The declaration in bison's
-   skeleton file comes too late.  This must come before <config.h>
-   because <config.h> may include arbitrary system headers.  */
+/* For bison < 2.0, the bison generated parser uses alloca.  AIX 3 forces us
+   to put this declaration at the beginning of the file.  The declaration in
+   bison's skeleton file comes too late.  This must come before <config.h>
+   because <config.h> may include arbitrary system headers.
+   This can go away once the AM_INTL_SUBDIR macro requires bison >= 2.0.  */
 #if defined _AIX && !defined __GNUC__
  #pragma alloca
 #endif
@@ -32,6 +33,7 @@
 
 #include <stddef.h>
 #include <stdlib.h>
+#include <string.h>
 #include "plural-exp.h"
 
 /* The main function generated by the parser is called __gettextparse,
diff --git a/intl/printf-args.c b/intl/printf-args.c
index f97590147..ee0faba16 100644
--- a/intl/printf-args.c
+++ b/intl/printf-args.c
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2003, 2005-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -16,9 +16,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "printf-args.h"
@@ -59,7 +57,7 @@ printf_fetchargs (va_list args, arguments *a)
       case TYPE_ULONGINT:
 	ap->a.a_ulongint = va_arg (args, unsigned long int);
 	break;
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
       case TYPE_LONGLONGINT:
 	ap->a.a_longlongint = va_arg (args, long long int);
 	break;
@@ -80,15 +78,40 @@ printf_fetchargs (va_list args, arguments *a)
 	break;
 #ifdef HAVE_WINT_T
       case TYPE_WIDE_CHAR:
-	ap->a.a_wide_char = va_arg (args, wint_t);
+	/* Although ISO C 99 7.24.1.(2) says that wint_t is "unchanged by
+	   default argument promotions", this is not the case in mingw32,
+	   where wint_t is 'unsigned short'.  */
+	ap->a.a_wide_char =
+	  (sizeof (wint_t) < sizeof (int)
+	   ? va_arg (args, int)
+	   : va_arg (args, wint_t));
 	break;
 #endif
       case TYPE_STRING:
 	ap->a.a_string = va_arg (args, const char *);
+	/* A null pointer is an invalid argument for "%s", but in practice
+	   it occurs quite frequently in printf statements that produce
+	   debug output.  Use a fallback in this case.  */
+	if (ap->a.a_string == NULL)
+	  ap->a.a_string = "(NULL)";
 	break;
 #ifdef HAVE_WCHAR_T
       case TYPE_WIDE_STRING:
 	ap->a.a_wide_string = va_arg (args, const wchar_t *);
+	/* A null pointer is an invalid argument for "%ls", but in practice
+	   it occurs quite frequently in printf statements that produce
+	   debug output.  Use a fallback in this case.  */
+	if (ap->a.a_wide_string == NULL)
+	  {
+	    static const wchar_t wide_null_string[] =
+	      {
+		(wchar_t)'(',
+		(wchar_t)'N', (wchar_t)'U', (wchar_t)'L', (wchar_t)'L',
+		(wchar_t)')',
+		(wchar_t)0
+	      };
+	    ap->a.a_wide_string = wide_null_string;
+	  }
 	break;
 #endif
       case TYPE_POINTER:
@@ -106,7 +129,7 @@ printf_fetchargs (va_list args, arguments *a)
       case TYPE_COUNT_LONGINT_POINTER:
 	ap->a.a_count_longint_pointer = va_arg (args, long int *);
 	break;
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
       case TYPE_COUNT_LONGLONGINT_POINTER:
 	ap->a.a_count_longlongint_pointer = va_arg (args, long long int *);
 	break;
diff --git a/intl/printf-args.h b/intl/printf-args.h
index 625b8036a..886febe66 100644
--- a/intl/printf-args.h
+++ b/intl/printf-args.h
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2003, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -48,7 +48,7 @@ typedef enum
   TYPE_UINT,
   TYPE_LONGINT,
   TYPE_ULONGINT,
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
   TYPE_LONGLONGINT,
   TYPE_ULONGLONGINT,
 #endif
@@ -69,7 +69,7 @@ typedef enum
   TYPE_COUNT_SHORT_POINTER,
   TYPE_COUNT_INT_POINTER,
   TYPE_COUNT_LONGINT_POINTER
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
 , TYPE_COUNT_LONGLONGINT_POINTER
 #endif
 } arg_type;
@@ -88,7 +88,7 @@ typedef struct
     unsigned int		a_uint;
     long int			a_longint;
     unsigned long int		a_ulongint;
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
     long long int		a_longlongint;
     unsigned long long int	a_ulonglongint;
 #endif
@@ -110,7 +110,7 @@ typedef struct
     short *			a_count_short_pointer;
     int *			a_count_int_pointer;
     long int *			a_count_longint_pointer;
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
     long long int *		a_count_longlongint_pointer;
 #endif
   }
diff --git a/intl/printf-parse.c b/intl/printf-parse.c
index 20240e379..1a06b1a90 100644
--- a/intl/printf-parse.c
+++ b/intl/printf-parse.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2003, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -16,9 +16,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #if WIDE_CHAR_VERSION
@@ -385,11 +383,14 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
 	      switch (c)
 		{
 		case 'd': case 'i':
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
+		  /* If 'long long' exists and is larger than 'long':  */
 		  if (flags >= 16 || (flags & 4))
 		    type = TYPE_LONGLONGINT;
 		  else
 #endif
+		  /* If 'long long' exists and is the same as 'long', we parse
+		     "lld" into TYPE_LONGINT.  */
 		  if (flags >= 8)
 		    type = TYPE_LONGINT;
 		  else if (flags & 2)
@@ -400,11 +401,14 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
 		    type = TYPE_INT;
 		  break;
 		case 'o': case 'u': case 'x': case 'X':
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
+		  /* If 'long long' exists and is larger than 'long':  */
 		  if (flags >= 16 || (flags & 4))
 		    type = TYPE_ULONGLONGINT;
 		  else
 #endif
+		  /* If 'unsigned long long' exists and is the same as
+		     'unsigned long', we parse "llu" into TYPE_ULONGINT.  */
 		  if (flags >= 8)
 		    type = TYPE_ULONGINT;
 		  else if (flags & 2)
@@ -459,11 +463,14 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
 		  type = TYPE_POINTER;
 		  break;
 		case 'n':
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
+		  /* If 'long long' exists and is larger than 'long':  */
 		  if (flags >= 16 || (flags & 4))
 		    type = TYPE_COUNT_LONGLONGINT_POINTER;
 		  else
 #endif
+		  /* If 'long long' exists and is the same as 'long', we parse
+		     "lln" into TYPE_COUNT_LONGINT_POINTER.  */
 		  if (flags >= 8)
 		    type = TYPE_COUNT_LONGINT_POINTER;
 		  else if (flags & 2)
diff --git a/intl/printf.c b/intl/printf.c
index 5e112b69b..004c66f78 100644
--- a/intl/printf.c
+++ b/intl/printf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings, using POSIX/XSI format strings with positions.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <[email protected]>, 2003.
 
    This program is free software; you can redistribute it and/or modify it
@@ -47,9 +47,16 @@ char *alloca ();
 
 #if !HAVE_POSIX_PRINTF
 
+#include <errno.h>
+#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 
+/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
+#ifndef EOVERFLOW
+# define EOVERFLOW E2BIG
+#endif
+
 /* When building a DLL, we must export some functions.  Note that because
    the functions are only defined for binary backward compatibility, we
    don't need to use __declspec(dllimport) in any case.  */
@@ -61,6 +68,14 @@ char *alloca ();
 
 #define STATIC static
 
+/* This needs to be consistent with libgnuintl.h.in.  */
+#if defined __NetBSD__ || defined __CYGWIN__ || defined __MINGW32__
+/* Don't break __attribute__((format(printf,M,N))).
+   This redefinition is only possible because the libc in NetBSD, Cygwin,
+   mingw does not have a function __printf__.  */
+# define libintl_printf __printf__
+#endif
+
 /* Define auxiliary functions declared in "printf-args.h".  */
 #include "printf-args.c"
 
@@ -88,9 +103,15 @@ libintl_vfprintf (FILE *stream, const char *format, va_list args)
       int retval = -1;
       if (result != NULL)
 	{
-	  if (fwrite (result, 1, length, stream) == length)
-	    retval = length;
+	  size_t written = fwrite (result, 1, length, stream);
 	  free (result);
+	  if (written == length)
+	    {
+	      if (length > INT_MAX)
+		errno = EOVERFLOW;
+	      else
+		retval = length;
+	    }
 	}
       return retval;
     }
@@ -144,6 +165,11 @@ libintl_vsprintf (char *resultbuf, const char *format, va_list args)
 	  free (result);
 	  return -1;
 	}
+      if (length > INT_MAX)
+	{
+	  errno = EOVERFLOW;
+	  return -1;
+	}
       else
 	return length;
     }
@@ -186,12 +212,16 @@ libintl_vsnprintf (char *resultbuf, size_t length, const char *format, va_list a
 	{
 	  if (maxlength > 0)
 	    {
-	      if (length < maxlength)
-		abort ();
-	      memcpy (resultbuf, result, maxlength - 1);
-	      resultbuf[maxlength - 1] = '\0';
+	      size_t pruned_length =
+		(length < maxlength ? length : maxlength - 1);
+	      memcpy (resultbuf, result, pruned_length);
+	      resultbuf[pruned_length] = '\0';
 	    }
 	  free (result);
+	}
+      if (length > INT_MAX)
+	{
+	  errno = EOVERFLOW;
 	  return -1;
 	}
       else
@@ -224,6 +254,12 @@ libintl_vasprintf (char **resultp, const char *format, va_list args)
   char *result = libintl_vasnprintf (NULL, &length, format, args);
   if (result == NULL)
     return -1;
+  if (length > INT_MAX)
+    {
+      free (result);
+      errno = EOVERFLOW;
+      return -1;
+    }
   *resultp = result;
   return length;
 }
@@ -285,9 +321,14 @@ libintl_vfwprintf (FILE *stream, const wchar_t *format, va_list args)
 	  for (i = 0; i < length; i++)
 	    if (fputwc (result[i], stream) == WEOF)
 	      break;
-	  if (i == length)
-	    retval = length;
 	  free (result);
+	  if (i == length)
+	    {
+	      if (length > INT_MAX)
+		errno = EOVERFLOW;
+	      else
+		retval = length;
+	    }
 	}
       return retval;
     }
@@ -340,12 +381,22 @@ libintl_vswprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, va_
 	{
 	  if (maxlength > 0)
 	    {
-	      if (length < maxlength)
-		abort ();
-	      memcpy (resultbuf, result, (maxlength - 1) * sizeof (wchar_t));
-	      resultbuf[maxlength - 1] = 0;
+	      size_t pruned_length =
+		(length < maxlength ? length : maxlength - 1);
+	      memcpy (resultbuf, result, pruned_length * sizeof (wchar_t));
+	      resultbuf[pruned_length] = 0;
 	    }
 	  free (result);
+	  /* Unlike vsnprintf, which has to return the number of character that
+	     would have been produced if the resultbuf had been sufficiently
+	     large, the vswprintf function has to return a negative value if
+	     the resultbuf was not sufficiently large.  */
+	  if (length >= maxlength)
+	    return -1;
+	}
+      if (length > INT_MAX)
+	{
+	  errno = EOVERFLOW;
 	  return -1;
 	}
       else
diff --git a/intl/relocatable.c b/intl/relocatable.c
index a2e5aa7ab..5e1dde6c8 100644
--- a/intl/relocatable.c
+++ b/intl/relocatable.c
@@ -1,5 +1,5 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <[email protected]>, 2003.
 
    This program is free software; you can redistribute it and/or modify it
@@ -25,9 +25,7 @@
 # define _GNU_SOURCE	1
 #endif
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "relocatable.h"
@@ -45,7 +43,7 @@
 # include "xalloc.h"
 #endif
 
-#if defined _WIN32 || defined __WIN32__
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 #endif
@@ -72,20 +70,20 @@
    ISSLASH(C)           tests whether C is a directory separator character.
    IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
  */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, OS/2, DOS */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 # define HAS_DEVICE(P) \
     ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
      && (P)[1] == ':')
 # define IS_PATH_WITH_DIR(P) \
     (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
-# define FILESYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
+# define FILE_SYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
 #else
   /* Unix */
 # define ISSLASH(C) ((C) == '/')
 # define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
-# define FILESYSTEM_PREFIX_LEN(P) 0
+# define FILE_SYSTEM_PREFIX_LEN(P) 0
 #endif
 
 /* Original installation prefix.  */
@@ -189,7 +187,7 @@ compute_curr_prefix (const char *orig_installprefix,
 
   /* Determine the current installation directory.  */
   {
-    const char *p_base = curr_pathname + FILESYSTEM_PREFIX_LEN (curr_pathname);
+    const char *p_base = curr_pathname + FILE_SYSTEM_PREFIX_LEN (curr_pathname);
     const char *p = curr_pathname + strlen (curr_pathname);
     char *q;
 
@@ -216,7 +214,7 @@ compute_curr_prefix (const char *orig_installprefix,
     const char *rp = rel_installdir + strlen (rel_installdir);
     const char *cp = curr_installdir + strlen (curr_installdir);
     const char *cp_base =
-      curr_installdir + FILESYSTEM_PREFIX_LEN (curr_installdir);
+      curr_installdir + FILE_SYSTEM_PREFIX_LEN (curr_installdir);
 
     while (rp > rel_installdir && cp > cp_base)
       {
@@ -234,8 +232,11 @@ compute_curr_prefix (const char *orig_installprefix,
 		  same = true;
 		break;
 	      }
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
-	    /* Win32, OS/2, DOS - case insignificant filesystem */
+	    /* Do case-insensitive comparison if the filesystem is always or
+	       often case-insensitive.  It's better to accept the comparison
+	       if the difference is only in case, rather than to fail.  */
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+	    /* Win32, Cygwin, OS/2, DOS - case insignificant filesystem */
 	    if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
 		!= (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
 	      break;
@@ -280,7 +281,7 @@ compute_curr_prefix (const char *orig_installprefix,
 /* Full pathname of shared library, or NULL.  */
 static char *shared_library_fullname;
 
-#if defined _WIN32 || defined __WIN32__
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
 
 /* Determine the full pathname of the shared library when it is loaded.  */
 
@@ -302,13 +303,31 @@ DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved)
 	/* Shouldn't happen.  */
 	return FALSE;
 
-      shared_library_fullname = strdup (location);
+      {
+#if defined __CYGWIN__
+	/* On Cygwin, we need to convert paths coming from Win32 system calls
+	   to the Unix-like slashified notation.  */
+	static char location_as_posix_path[2 * MAX_PATH];
+	/* There's no error return defined for cygwin_conv_to_posix_path.
+	   See cygwin-api/func-cygwin-conv-to-posix-path.html.
+	   Does it overflow the buffer of expected size MAX_PATH or does it
+	   truncate the path?  I don't know.  Let's catch both.  */
+	cygwin_conv_to_posix_path (location, location_as_posix_path);
+	location_as_posix_path[MAX_PATH - 1] = '\0';
+	if (strlen (location_as_posix_path) >= MAX_PATH - 1)
+	  /* A sign of buffer overflow or path truncation.  */
+	  return FALSE;
+	shared_library_fullname = strdup (location_as_posix_path);
+#else
+	shared_library_fullname = strdup (location);
+#endif
+      }
     }
 
   return TRUE;
 }
 
-#else /* Unix */
+#else /* Unix except Cygwin */
 
 static void
 find_shared_library_fullname ()
@@ -359,15 +378,15 @@ find_shared_library_fullname ()
 #endif
 }
 
-#endif /* WIN32 / Unix */
+#endif /* (WIN32 or Cygwin) / (Unix except Cygwin) */
 
 /* Return the full pathname of the current shared library.
    Return NULL if unknown.
-   Guaranteed to work only on Linux and Woe32.  */
+   Guaranteed to work only on Linux, Cygwin and Woe32.  */
 static char *
 get_shared_library_fullname ()
 {
-#if !(defined _WIN32 || defined __WIN32__)
+#if !(defined _WIN32 || defined __WIN32__ || defined __CYGWIN__)
   static bool tried_find_shared_library_fullname;
   if (!tried_find_shared_library_fullname)
     {
diff --git a/intl/relocatable.h b/intl/relocatable.h
index 614e64e2f..f6d38321a 100644
--- a/intl/relocatable.h
+++ b/intl/relocatable.h
@@ -1,5 +1,5 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
    Written by Bruno Haible <[email protected]>, 2003.
 
    This program is free software; you can redistribute it and/or modify it
@@ -31,7 +31,9 @@ extern "C" {
 /* When building a DLL, we must export some functions.  Note that because
    this is a private .h file, we don't need to use __declspec(dllimport)
    in any case.  */
-#if defined _MSC_VER && BUILDING_DLL
+#if HAVE_VISIBILITY && BUILDING_DLL
+# define RELOCATABLE_DLL_EXPORTED __attribute__((__visibility__("default")))
+#elif defined _MSC_VER && BUILDING_DLL
 # define RELOCATABLE_DLL_EXPORTED __declspec(dllexport)
 #else
 # define RELOCATABLE_DLL_EXPORTED
diff --git a/intl/textdomain.c b/intl/textdomain.c
index 2bf62407d..c316460fd 100644
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -1,5 +1,5 @@
 /* Implementation of the textdomain(3) function.
-   Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2003, 2005-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -23,21 +23,21 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
 # include "libgnuintl.h"
 #endif
-#include "gettextP.h"
 
+/* Handle multi-threaded applications.  */
 #ifdef _LIBC
-/* We have to handle multi-threaded applications.  */
 # include <bits/libc-lock.h>
+# define gl_rwlock_define __libc_rwlock_define
+# define gl_rwlock_wrlock __libc_rwlock_wrlock
+# define gl_rwlock_unlock __libc_rwlock_unlock
 #else
-/* Provide dummy implementation if this is outside glibc.  */
-# define __libc_rwlock_define(CLASS, NAME)
-# define __libc_rwlock_wrlock(NAME)
-# define __libc_rwlock_unlock(NAME)
+# include "lock.h"
 #endif
 
 /* The internal variables in the standalone libintl.a must have different
@@ -71,7 +71,7 @@ extern const char *_nl_current_default_domain attribute_hidden;
 #endif
 
 /* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
+gl_rwlock_define (extern, _nl_state_lock attribute_hidden)
 
 /* Set the current default message catalog to DOMAINNAME.
    If DOMAINNAME is null, return the current default.
@@ -86,7 +86,7 @@ TEXTDOMAIN (const char *domainname)
   if (domainname == NULL)
     return (char *) _nl_current_default_domain;
 
-  __libc_rwlock_wrlock (_nl_state_lock);
+  gl_rwlock_wrlock (_nl_state_lock);
 
   old_domain = (char *) _nl_current_default_domain;
 
@@ -130,7 +130,7 @@ TEXTDOMAIN (const char *domainname)
 	free (old_domain);
     }
 
-  __libc_rwlock_unlock (_nl_state_lock);
+  gl_rwlock_unlock (_nl_state_lock);
 
   return new_domain;
 }
diff --git a/intl/vasnprintf.c b/intl/vasnprintf.c
index f192f2088..8b073103b 100644
--- a/intl/vasnprintf.c
+++ b/intl/vasnprintf.c
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -23,9 +23,7 @@
 # define _GNU_SOURCE    1
 #endif
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 #ifndef IN_LIBINTL
 # include <alloca.h>
 #endif
@@ -251,7 +249,7 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
 		  case TYPE_COUNT_LONGINT_POINTER:
 		    *a.arg[dp->arg_index].a.a_count_longint_pointer = length;
 		    break;
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
 		  case TYPE_COUNT_LONGLONGINT_POINTER:
 		    *a.arg[dp->arg_index].a.a_count_longlongint_pointer = length;
 		    break;
@@ -316,9 +314,8 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
 			  const CHAR_T *digitp = dp->precision_start + 1;
 
 			  precision = 0;
-			  do
+			  while (digitp != dp->precision_end)
 			    precision = xsum (xtimes (precision, 10), *digitp++ - '0');
-			  while (digitp != dp->precision_end);
 			}
 		    }
 
@@ -326,44 +323,43 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
 		    {
 
 		    case 'd': case 'i': case 'u':
-# ifdef HAVE_LONG_LONG
+# ifdef HAVE_LONG_LONG_INT
 		      if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
 			tmp_length =
 			  (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
 					  * 0.30103 /* binary -> decimal */
-					  * 2 /* estimate for FLAG_GROUP */
 					 )
-			  + 1 /* turn floor into ceil */
-			  + 1; /* account for leading sign */
+			  + 1; /* turn floor into ceil */
 		      else
 # endif
 		      if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
 			tmp_length =
 			  (unsigned int) (sizeof (unsigned long) * CHAR_BIT
 					  * 0.30103 /* binary -> decimal */
-					  * 2 /* estimate for FLAG_GROUP */
 					 )
-			  + 1 /* turn floor into ceil */
-			  + 1; /* account for leading sign */
+			  + 1; /* turn floor into ceil */
 		      else
 			tmp_length =
 			  (unsigned int) (sizeof (unsigned int) * CHAR_BIT
 					  * 0.30103 /* binary -> decimal */
-					  * 2 /* estimate for FLAG_GROUP */
 					 )
-			  + 1 /* turn floor into ceil */
-			  + 1; /* account for leading sign */
+			  + 1; /* turn floor into ceil */
+		      if (tmp_length < precision)
+			tmp_length = precision;
+		      /* Multiply by 2, as an estimate for FLAG_GROUP.  */
+		      tmp_length = xsum (tmp_length, tmp_length);
+		      /* Add 1, to account for a leading sign.  */
+		      tmp_length = xsum (tmp_length, 1);
 		      break;
 
 		    case 'o':
-# ifdef HAVE_LONG_LONG
+# ifdef HAVE_LONG_LONG_INT
 		      if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
 			tmp_length =
 			  (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
 					  * 0.333334 /* binary -> octal */
 					 )
-			  + 1 /* turn floor into ceil */
-			  + 1; /* account for leading sign */
+			  + 1; /* turn floor into ceil */
 		      else
 # endif
 		      if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
@@ -371,26 +367,27 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
 			  (unsigned int) (sizeof (unsigned long) * CHAR_BIT
 					  * 0.333334 /* binary -> octal */
 					 )
-			  + 1 /* turn floor into ceil */
-			  + 1; /* account for leading sign */
+			  + 1; /* turn floor into ceil */
 		      else
 			tmp_length =
 			  (unsigned int) (sizeof (unsigned int) * CHAR_BIT
 					  * 0.333334 /* binary -> octal */
 					 )
-			  + 1 /* turn floor into ceil */
-			  + 1; /* account for leading sign */
+			  + 1; /* turn floor into ceil */
+		      if (tmp_length < precision)
+			tmp_length = precision;
+		      /* Add 1, to account for a leading sign.  */
+		      tmp_length = xsum (tmp_length, 1);
 		      break;
 
 		    case 'x': case 'X':
-# ifdef HAVE_LONG_LONG
+# ifdef HAVE_LONG_LONG_INT
 		      if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
 			tmp_length =
 			  (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
 					  * 0.25 /* binary -> hexadecimal */
 					 )
-			  + 1 /* turn floor into ceil */
-			  + 2; /* account for leading sign or alternate form */
+			  + 1; /* turn floor into ceil */
 		      else
 # endif
 		      if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
@@ -398,15 +395,17 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
 			  (unsigned int) (sizeof (unsigned long) * CHAR_BIT
 					  * 0.25 /* binary -> hexadecimal */
 					 )
-			  + 1 /* turn floor into ceil */
-			  + 2; /* account for leading sign or alternate form */
+			  + 1; /* turn floor into ceil */
 		      else
 			tmp_length =
 			  (unsigned int) (sizeof (unsigned int) * CHAR_BIT
 					  * 0.25 /* binary -> hexadecimal */
 					 )
-			  + 1 /* turn floor into ceil */
-			  + 2; /* account for leading sign or alternate form */
+			  + 1; /* turn floor into ceil */
+		      if (tmp_length < precision)
+			tmp_length = precision;
+		      /* Add 2, to account for a leading sign or alternate form.  */
+		      tmp_length = xsum (tmp_length, 2);
 		      break;
 
 		    case 'f': case 'F':
@@ -529,7 +528,7 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
 
 		switch (type)
 		  {
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
 		  case TYPE_LONGLONGINT:
 		  case TYPE_ULONGLONGINT:
 		    *p++ = 'l';
@@ -683,7 +682,7 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
 			  SNPRINTF_BUF (arg);
 			}
 			break;
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
 		      case TYPE_LONGLONGINT:
 			{
 			  long long int arg = a.arg[dp->arg_index].a.a_longlongint;
@@ -864,6 +863,10 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
       free (buf_malloced);
     CLEANUP ();
     *lengthp = length;
+    /* Note that we can produce a big string of a length > INT_MAX.  POSIX
+       says that snprintf() fails with errno = EOVERFLOW in this case, but
+       that's only because snprintf() returns an 'int'.  This function does
+       not have this limitation.  */
     return result;
 
   out_of_memory:
diff --git a/intl/vasnprintf.h b/intl/vasnprintf.h
index 5c62fb28b..e67b88da3 100644
--- a/intl/vasnprintf.h
+++ b/intl/vasnprintf.h
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -48,7 +48,24 @@ extern "C" {
    If successful, return the address of the string (this may be = RESULTBUF
    if no dynamic memory allocation was necessary) and set *LENGTHP to the
    number of resulting bytes, excluding the trailing NUL.  Upon error, set
-   errno and return NULL.  */
+   errno and return NULL.
+
+   When dynamic memory allocation occurs, the preallocated buffer is left
+   alone (with possibly modified contents).  This makes it possible to use
+   a statically allocated or stack-allocated buffer, like this:
+
+          char buf[100];
+          size_t len = sizeof (buf);
+          char *output = vasnprintf (buf, &len, format, args);
+          if (output == NULL)
+            ... error handling ...;
+          else
+            {
+              ... use the output string ...;
+              if (output != buf)
+                free (output);
+            }
+  */
 extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
        __attribute__ ((__format__ (__printf__, 3, 4)));
 extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
diff --git a/intl/version.c b/intl/version.c
new file mode 100644
index 000000000..a968cf746
--- /dev/null
+++ b/intl/version.c
@@ -0,0 +1,26 @@
+/* libintl library version.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "libgnuintl.h"
+
+/* Version number: (major<<16) + (minor<<8) + subminor */
+int libintl_version = LIBINTL_VERSION;
diff --git a/kbx/ChangeLog b/kbx/ChangeLog
deleted file mode 100644
index af6e6b016..000000000
--- a/kbx/ChangeLog
+++ /dev/null
@@ -1,119 +0,0 @@
-2003-06-03  Werner Koch  <[email protected]>
-	
-	Changed all error codes in all files to the new libgpg-error scheme.
-
-	* keybox-defs.h: Include gpg-error.h .
-	(KeyboxError): Removed. 
-	* Makefile.am: Removed keybox-error.c stuff.
-
-2002-11-14  Werner Koch  <[email protected]>
-
-	* keybox-search.c (blob_cmp_name) <compare all names>: Fixed
-	length compare; there is no 0 stored since nearly a year.  
-
-2002-10-31  Neal H. Walfield  <[email protected]>
-
-	* Makefile.am (AM_CPPFLAGS): Fix ytpo.
-
-2002-08-10  Werner Koch  <[email protected]>
-
-	* keybox-search.c (blob_cmp_fpr_part): New.
-	(has_short_kid, has_long_kid): Implemented.
-
-2002-07-22  Werner Koch  <[email protected]>
-
-	* keybox-defs.h: New BLOBTYPTE_EMPTY.
-	* keybox-dump.c (_keybox_dump_blob): Handle new type.
-	* keybox-file.c (_keybox_read_blob): Skip over empty blobs.  Store
-	the file offset.
-	* keybox-blob.c (_keybox_new_blob): Add new arg OFF.
-	(_keybox_get_blob_fileoffset): New.
-	* keybox-update.c (keybox_delete): Implemented.
-
-2002-06-19  Werner Koch  <[email protected]>
-
-	* keybox-init.c (keybox_set_ephemeral): New.
-	* keybox-blob.c (create_blob_header): Store ephemeral flag.
-	(_keybox_create_x509_blob): Pass epheermal flag on.
-	* keybox-update.c (keybox_insert_cert): Ditto.
-	* keybox-search.c (blob_get_blob_flags): New.
-	(keybox_search): Ignore ephemeral blobs when not in ephemeral mode.
-
-	* keybox-dump.c (_keybox_dump_blob): Print blob flags as strings.
-
-2002-02-25  Werner Koch  <[email protected]>
-
-	* keybox-search.c (blob_cmp_mail): Use case-insensitive compare
-	because mail addresses are in general case insensitive (well
-	RFC2822 allows for case sensitive mailbox parts, but this is in
-	general considired a Bad Thing). Add additional substr parameter
-	to allow for substring matches within the mail address.  Change
-	all callers to pass this along.
-	(blob_cmp_name): Likewise but do the case-insensitive search only
-	in sub string mode.
-	(keybox_search): Implement MAILSUB and SUBSTR mode.
-
-2002-01-21  Werner Koch  <[email protected]>
-
-	* keybox-search.c (keybox_search): Allow KEYDB_SEARCH_MODE_FPR20.
-
-2002-01-15  Werner Koch  <[email protected]>
-
-	* keybox-search.c (blob_cmp_fpr): New.
-	(has_fingerprint): Implemented;
-
-2001-12-20  Werner Koch  <[email protected]>
-
-	* keybox-blob.c (_keybox_create_x509_blob): Skip the leading
-	parenthesis of the serial number's S-exp.
-	(_keybox_create_x509_blob): And fixed length calculation.
-	(create_blob_header): Don't add an offset when writing the serial.
-
-2001-12-18  Werner Koch  <[email protected]>
-
-	* Makefile.am (AM_CPPFLAGS): Add flags for libksba
-
-	* keybox-blob.c (_keybox_create_x509_blob): Use
-	gcry_sexp_canon_len to get the length of the serial number.
-	(_keybox_release_blob): Need to use a new serialbuf to free the memory.
-
-2001-12-17  Werner Koch  <[email protected]>
-
-	* keybox-search.c: Changed the way the serial number is
-	represented.
-
-2001-12-15  Werner Koch  <[email protected]>
-
-	* keybox-search.c (blob_cmp_name): There is no terminating 0 stored
-	for the uid; fixed length compare.
-
-2001-12-14  Werner Koch  <[email protected]>
-
-	* keybox-blob.c (x509_email_kludge): New.
-	(_keybox_create_x509_blob): Insert an extra email address if the
-	subject's DN has an email part.
-	* keybox-defs.h: Added the xtoi_2 and digitp macros.
-
-2001-12-13  Werner Koch  <[email protected]>
-
-	* keybox-search.c (blob_cmp_name): Kludge to allow searching for
-	more than one name.
-	(has_subject_or_alt): New.
-	(blob_cmp_mail): New.
-	(has_mail): New.
-	(keybox_search): Implemented exact search and exact mail search.
-
-	* kbx/keybox-blob.c (_keybox_create_x509_blob): Insert alternate
-	names.
-
-
- Copyright 2001 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.
-	
\ No newline at end of file
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
deleted file mode 100644
index 4f0c40043..000000000
--- a/kbx/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-# Keybox Makefile 
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-#
-# This file is part of GnuPG.
-#
-# GnuPG is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# GnuPG is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-## Process this file with automake to produce Makefile.in
-
-localedir = $(datadir)/locale
-INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
-
-EXTRA_DIST = mkerrors
-AM_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/intl \
-	       $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
-
-noinst_LIBRARIES = libkeybox.a
-bin_PROGRAMS = kbxutil
-
-common_sources = \
-	keybox.h keybox-defs.h keybox-search-desc.h \
-	keybox-util.c \
-	keybox-init.c \
-	keybox-blob.c \
-	keybox-file.c \
-	keybox-search.c \
-	keybox-update.c \
-	keybox-dump.c 
-
-
-libkeybox_a_SOURCES = $(common_sources)
-
-kbxutil_SOURCES = kbxutil.c $(common_sources)
-kbxutil_LDADD   = ../jnlib/libjnlib.a  $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
-                  -lgpg-error @INTLLIBS@ 
-
-
-
-
-
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c
deleted file mode 100644
index abca4faa9..000000000
--- a/kbx/kbxutil.c
+++ /dev/null
@@ -1,339 +0,0 @@
-/* kbxutil.c - The Keybox utility
- *	Copyright (C) 2000, 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <config.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-
-#include "../jnlib/logging.h"
-#include "../jnlib/argparse.h"
-#include "../jnlib/stringhelp.h"
-#include "../common/i18n.h"
-#include "keybox-defs.h"
-
-#include <gcrypt.h>
-
-
-enum cmd_and_opt_values {
-  aNull = 0,
-  oArmor	  = 'a',
-  oDryRun	  = 'n',
-  oOutput	  = 'o',
-  oQuiet	  = 'q',
-  oVerbose	  = 'v',
-  
-  aNoSuchCmd    = 500,   /* force other values not to be a letter */
-  aFindByFpr,
-  aFindByKid,
-  aFindByUid,
-
-  oDebug,
-  oDebugAll,
-
-  oNoArmor,
-  
-
-  aTest
-};
-
-
-static ARGPARSE_OPTS opts[] = {
-  { 300, NULL, 0, N_("@Commands:\n ") },
-
-  { aFindByFpr,  "find-by-fpr", 0, "|FPR| find key using it's fingerprnt" },
-  { aFindByKid,  "find-by-kid", 0, "|KID| find key using it's keyid" },
-  { aFindByUid,  "find-by-uid", 0, "|NAME| find key by user name" },
-  
-  { 301, NULL, 0, N_("@\nOptions:\n ") },
-  
-  { oArmor, "armor",     0, N_("create ascii armored output")},
-  { oArmor, "armour",     0, "@" },
-  { oOutput, "output",    2, N_("use as output file")},
-  { oVerbose, "verbose",   0, N_("verbose") },
-  { oQuiet,	"quiet",   0, N_("be somewhat more quiet") },
-  { oDryRun, "dry-run",   0, N_("do not make any changes") },
-  
-  { oDebug, "debug"     ,4|16, N_("set debugging flags")},
-  { oDebugAll, "debug-all" ,0, N_("enable full debugging")},
-
-  {0} /* end of list */
-};
-
-
-void myexit (int rc);
-
-int keybox_errors_seen = 0;
-
-
-static const char *
-my_strusage( int level )
-{
-    const char *p;
-    switch( level ) {
-      case 11: p = "kbxutil (GnuPG)";
-	break;
-      case 13: p = VERSION; break;
-      case 17: p = PRINTABLE_OS_NAME; break;
-      case 19: p =
-	    _("Please report bugs to " PACKAGE_BUGREPORT ".\n");
-	break;
-      case 1:
-      case 40:	p =
-	    _("Usage: kbxutil [options] [files] (-h for help)");
-	break;
-      case 41:	p =
-	    _("Syntax: kbxutil [options] [files]\n"
-	      "list, export, import Keybox data\n");
-	break;
-
-
-      default:	p = NULL;
-    }
-    return p;
-}
-
-
-static void
-i18n_init(void)
-{
-  #ifdef USE_SIMPLE_GETTEXT
-    set_gettext_file( PACKAGE );
-  #else
-  #ifdef ENABLE_NLS
-    #ifdef HAVE_LC_MESSAGES
-       setlocale( LC_TIME, "" );
-       setlocale( LC_MESSAGES, "" );
-    #else
-       setlocale( LC_ALL, "" );
-    #endif
-    bindtextdomain( PACKAGE, LOCALEDIR );
-    textdomain( PACKAGE );
-  #endif
-  #endif
-}
-
-
-/*  static void */
-/*  wrong_args( const char *text ) */
-/*  { */
-/*      log_error("usage: kbxutil %s\n", text); */
-/*      myexit ( 1 ); */
-/*  } */
-
-
-#if 0
-static int
-hextobyte( const byte *s )
-{
-    int c;
-
-    if( *s >= '0' && *s <= '9' )
-	c = 16 * (*s - '0');
-    else if( *s >= 'A' && *s <= 'F' )
-	c = 16 * (10 + *s - 'A');
-    else if( *s >= 'a' && *s <= 'f' )
-	c = 16 * (10 + *s - 'a');
-    else
-	return -1;
-    s++;
-    if( *s >= '0' && *s <= '9' )
-	c += *s - '0';
-    else if( *s >= 'A' && *s <= 'F' )
-	c += 10 + *s - 'A';
-    else if( *s >= 'a' && *s <= 'f' )
-	c += 10 + *s - 'a';
-    else
-	return -1;
-    return c;
-}
-#endif
-
-#if 0
-static char *
-format_fingerprint ( const char *s )
-{
-    int i, c;
-    byte fpr[20];
-
-    for (i=0; i < 20 && *s; ) {
-	if ( *s == ' ' || *s == '\t' ) {
-	    s++;
-	    continue;
-	}
-	c = hextobyte(s);
-	if (c == -1) {
-	    return NULL;
-	}
-	fpr[i++] = c;
-	s += 2;
-    }
-    return gcry_xstrdup ( fpr );
-}
-#endif
-
-#if 0
-static int
-format_keyid ( const char *s, u32 *kid )
-{
-    char helpbuf[9];
-    switch ( strlen ( s ) ) {
-      case 8:
-	kid[0] = 0;
-	kid[1] = strtoul( s, NULL, 16 );
-	return 10;
-
-      case 16:
-	mem2str( helpbuf, s, 9 );
-	kid[0] = strtoul( helpbuf, NULL, 16 );
-	kid[1] = strtoul( s+8, NULL, 16 );
-	return 11;
-    }
-    return 0; /* error */
-}
-#endif
-
-
-int
-main( int argc, char **argv )
-{
-  ARGPARSE_ARGS pargs;
-  enum cmd_and_opt_values cmd = 0;
-  
-  set_strusage( my_strusage );
-  /*log_set_name("kbxutil"); fixme */
-#if 0
-  /* check that the libraries are suitable.  Do it here because
-   * the option parse may need services of the library */
-  if ( !gcry_check_version ( "1.1.4" ) ) 
-    {
-      log_fatal(_("libgcrypt is too old (need %s, have %s)\n"),
-                "1.1.4", gcry_check_version(NULL) );
-    }
-#endif
-
-  /*create_dotlock(NULL); register locking cleanup */
-  i18n_init();
-
-  /* We need to use the gcry malloc function because jnlib does use them */
-  keybox_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free);
-  ksba_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free );
-
-
-  pargs.argc = &argc;
-  pargs.argv = &argv;
-  pargs.flags=  1;  /* do not remove the args */
-  while (arg_parse( &pargs, opts) )
-    {
-      switch (pargs.r_opt)
-        {
-        case oVerbose:
-          /*opt.verbose++;*/
-          /*gcry_control( GCRYCTL_SET_VERBOSITY, (int)opt.verbose );*/
-          break;
-        case oDebug:
-          /*opt.debug |= pargs.r.ret_ulong; */
-          break;
-        case oDebugAll:
-          /*opt.debug = ~0;*/
-          break;
-
-        case aFindByFpr:
-        case aFindByKid:
-        case aFindByUid:
-          cmd = pargs.r_opt;
-          break;
-          
-        default:
-          pargs.err = 2;
-          break;
-	}
-    }
-  if (log_get_errorcount(0) )
-    myexit(2);
-  
-  if (!cmd)
-      { /* default is to list a KBX file */
-	if (!argc) 
-          _keybox_dump_file (NULL, stdout);
-	else
-          {
-	    for (; argc; argc--, argv++) 
-              _keybox_dump_file (*argv, stdout);
-          }
-    }
-#if 0
-    else if ( cmd == aFindByFpr ) {
-	char *fpr;
-	if ( argc != 2 )
-	    wrong_args ("kbxfile foingerprint");
-	fpr = format_fingerprint ( argv[1] );
-	if ( !fpr )
-	    log_error ("invalid formatted fingerprint\n");
-	else {
-	    kbxfile_search_by_fpr ( argv[0], fpr );
-	    gcry_free ( fpr );
-	}
-    }
-    else if ( cmd == aFindByKid ) {
-	u32 kid[2];
-	int mode;
-
-	if ( argc != 2 )
-	    wrong_args ("kbxfile short-or-long-keyid");
-	mode = format_keyid ( argv[1], kid );
-	if ( !mode )
-	    log_error ("invalid formatted keyID\n");
-	else {
-	    kbxfile_search_by_kid ( argv[0], kid, mode );
-	}
-    }
-    else if ( cmd == aFindByUid ) {
-	if ( argc != 2 )
-	    wrong_args ("kbxfile userID");
-	kbxfile_search_by_uid ( argv[0], argv[1] );
-    }
-#endif
-    else
-	log_error ("unsupported action\n");
-
-    myexit(0);
-    return 8; /*NEVER REACHED*/
-}
-
-
-void
-myexit( int rc )
-{
-  /*    if( opt.debug & DBG_MEMSTAT_VALUE ) {*/
-/*  	gcry_control( GCRYCTL_DUMP_MEMORY_STATS ); */
-/*  	gcry_control( GCRYCTL_DUMP_RANDOM_STATS ); */
-  /*    }*/
-/*      if( opt.debug ) */
-/*  	gcry_control( GCRYCTL_DUMP_SECMEM_STATS ); */
-    rc = rc? rc : log_get_errorcount(0)? 2 :
-			keybox_errors_seen? 1 : 0;
-    exit(rc );
-}
-
-
diff --git a/kbx/keybox-blob.c b/kbx/keybox-blob.c
deleted file mode 100644
index 8a85e0270..000000000
--- a/kbx/keybox-blob.c
+++ /dev/null
@@ -1,1008 +0,0 @@
-/* keybox-blob.c - KBX Blob handling
- *	Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-
-/* The keybox data formats
-
-The KeyBox uses an augmented OpenPGP/X.509 key format.  This makes
-random access to a keyblock/Certificate easier and also gives the
-opportunity to store additional information (e.g. the fingerprint)
-along with the key.  All integers are stored in network byte order,
-offsets are counted from the beginning of the Blob.
-
-The first record of a plain KBX file has a special format:
-
- u32  length of the first record
- byte Blob type (1)
- byte version number (1)
- byte reserved
- byte reserved
- u32  magic 'KBXf'
- byte pgp_marginals  used for validity calculation of this file
- byte pgp_completes  ditto.
- byte pgp_cert_depth ditto.
-
-The OpenPGP and X.509 blob are verry similiar, things which are
-X.509 specific are noted like [X.509: xxx]
-
- u32  length of this blob (including these 4 bytes)
- byte Blob type (2) [X509: 3]
- byte version number of this blob type (1)
- u16  Blob flags
-	bit 0 = contains secret key material
-        bit 1 = ephemeral blob (e.g. used while quering external resources)
-
- u32  offset to the OpenPGP keyblock or X509 DER encoded certificate
- u32  and its length
- u16  number of keys (at least 1!) [X509: always 1]
- u16  size of additional key information
- n times:
-   b20	The keys fingerprint
-	(fingerprints are always 20 bytes, MD5 left padded with zeroes)
-   u32	offset to the n-th key's keyID (a keyID is always 8 byte)
-        or 0 if not known which is the case only for X509.
-   u16	special key flags
-	 bit 0 =
-   u16	reserved
- u16  size of serialnumber(may be zero) 
-   n  u16 (see above) bytes of serial number
- u16  number of user IDs
- u16  size of additional user ID information
- n times:
-   u32	offset to the n-th user ID
-   u32	length of this user ID.
-   u16	special user ID flags.
-	 bit 0 =
-   byte validity
-   byte reserved
-   [For X509, the first user ID is the issuer, the second the subject
-   and the others are subjectAltNames]
- u16  number of signatures
- u16  size of signature information (4)
-   u32	expiration time of signature with some special values:
-	0x00000000 = not checked
-	0x00000001 = missing key
-	0x00000002 = bad signature
-	0x10000000 = valid and expires at some date in 1978.
-	0xffffffff = valid and does not expire
- u8	assigned ownertrust [X509: no used]
- u8	all_validity        [X509: no used]
- u16	reserved
- u32	recheck_after
- u32	Newest timestamp in the keyblock (useful for KS syncronsiation?)
- u32	Blob created at
- u32	size of reserved space (not including this field)
-      reserved space
-
-    Here we might want to put other data
-
-    Here comes the keyblock
-
-    maybe we put a signature here later.
-
- b16	MD5 checksum  (useful for KS syncronisation), we might also want to use
-    a mac here.
- b4    reserved
-
-*/
-
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#include "keybox-defs.h"
-#include <gcrypt.h>
-
-#ifdef KEYBOX_WITH_OPENPGP
-/* include stuff to parse the packets */
-#endif
-#ifdef KEYBOX_WITH_X509
-#include <ksba.h>
-#endif
-
-
-
-/* special values of the signature status */
-#define SF_NONE(a)  ( !(a) )
-#define SF_NOKEY(a) ((a) & (1<<0))
-#define SF_BAD(a)   ((a) & (1<<1))
-#define SF_VALID(a) ((a) & (1<<29))
-
-
-struct membuf {
-  size_t len;
-  size_t size;
-  char *buf;
-  int out_of_core;
-};
-
-
-/*  #if MAX_FINGERPRINT_LEN < 20 */
-/*    #error fingerprints are 20 bytes */
-/*  #endif */
-
-struct keyboxblob_key {
-  char   fpr[20];
-  u32    off_kid;
-  ulong  off_kid_addr;
-  u16    flags;
-};
-struct keyboxblob_uid {
-  ulong  off_addr;
-  char   *name;     /* used only with x509 */
-  u32    len;
-  u16    flags;
-  byte   validity;
-};
-
-struct keyid_list {
-    struct keyid_list *next;
-    int seqno;
-    byte kid[8];
-};
-
-struct fixup_list {
-    struct fixup_list *next;
-    u32 off;
-    u32 val;
-};
-
-
-struct keyboxblob {
-  byte *blob;
-  size_t bloblen;
-  off_t fileoffset;
-  
-  /* stuff used only by keybox_create_blob */
-  unsigned char *serialbuf;
-  const unsigned char *serial;
-  size_t seriallen;
-  int nkeys;
-  struct keyboxblob_key *keys;
-  int nuids;
-  struct keyboxblob_uid *uids;
-  int nsigs;
-  u32  *sigs;
-  struct fixup_list *fixups;
-  int fixup_out_of_core;
-  
-  struct keyid_list *temp_kids;
-  struct membuf bufbuf; /* temporary store for the blob */
-  struct membuf *buf; 
-};
-
-
-
-/* A simple implemnation of a dynamic buffer.  Use init_membuf() to
-   create a buffer, put_membuf to append bytes and get_membuf to
-   release and return the buffer.  Allocation errors are detected but
-   only returned at the final get_membuf(), this helps not to clutter
-   the code with out of core checks.  */
-
-static void
-init_membuf (struct membuf *mb, int initiallen)
-{
-  mb->len = 0;
-  mb->size = initiallen;
-  mb->out_of_core = 0;
-  mb->buf = xtrymalloc (initiallen);
-  if (!mb->buf)
-      mb->out_of_core = 1;
-}
-
-static void
-put_membuf (struct membuf *mb, const void *buf, size_t len)
-{
-  if (mb->out_of_core)
-    return;
-
-  if (mb->len + len >= mb->size)
-    {
-      char *p;
-      
-      mb->size += len + 1024;
-      p = xtryrealloc (mb->buf, mb->size);
-      if (!p)
-        {
-          mb->out_of_core = 1;
-          return;
-        }
-      mb->buf = p;
-    }
-  memcpy (mb->buf + mb->len, buf, len);
-  mb->len += len;
-}
-
-static void *
-get_membuf (struct membuf *mb, size_t *len)
-{
-  char *p;
-
-  if (mb->out_of_core)
-    {
-      xfree (mb->buf);
-      mb->buf = NULL;
-      return NULL;
-    }
-
-  p = mb->buf;
-  *len = mb->len;
-  mb->buf = NULL;
-  mb->out_of_core = 1; /* don't allow a reuse */
-  return p;
-}
-
-
-static void
-put8 (struct membuf *mb, byte a )
-{
-  put_membuf (mb, &a, 1);
-}
-
-static void
-put16 (struct membuf *mb, u16 a )
-{
-  unsigned char tmp[2];
-  tmp[0] = a>>8;
-  tmp[1] = a;
-  put_membuf (mb, tmp, 2);
-}
-
-static void
-put32 (struct membuf *mb, u32 a )
-{
-  unsigned char tmp[4];
-  tmp[0] = a>>24;
-  tmp[1] = a>>16;
-  tmp[2] = a>>8;
-  tmp[3] = a;
-  put_membuf (mb, tmp, 4);
-}
-
-
-/* Store a value in the fixup list */
-static void
-add_fixup (KEYBOXBLOB blob, u32 off, u32 val)
-{
-  struct fixup_list *fl;
-  
-  if (blob->fixup_out_of_core)
-    return;
-
-  fl = xtrycalloc(1, sizeof *fl);
-  if (!fl)
-    blob->fixup_out_of_core = 1;
-  else 
-    {
-      fl->off = off;
-      fl->val = val;
-      fl->next = blob->fixups;
-      blob->fixups = fl;
-    }
-}
-
-
-/*
- Some wrappers
-*/
-
-static u32
-make_timestamp (void)
-{
-  return time(NULL);
-}
-
-
-
-#ifdef KEYBOX_WITH_OPENPGP
-/*
-  OpenPGP specific stuff 
-*/
-
-
-/*
-  We must store the keyid at some place because we can't calculate the
-  offset yet. This is only used for v3 keyIDs.  Function returns an
-  index value for later fixup or -1 for out of core. The value must be
-  a non-zero value */
-static int
-pgp_temp_store_kid (KEYBOXBLOB blob, PKT_public_key *pk)
-{
-  struct keyid_list *k, *r;
-  
-  k = xtrymalloc (sizeof *k); 
-  if (!k)
-    return -1;
-  k->kid[0] = pk->keyid[0] >> 24 ;
-  k->kid[1] = pk->keyid[0] >> 16 ;
-  k->kid[2] = pk->keyid[0] >>  8 ;
-  k->kid[3] = pk->keyid[0]	   ;
-  k->kid[4] = pk->keyid[0] >> 24 ;
-  k->kid[5] = pk->keyid[0] >> 16 ;
-  k->kid[6] = pk->keyid[0] >>  8 ;
-  k->kid[7] = pk->keyid[0]	   ;
-  k->seqno = 0;
-  k->next = blob->temp_kids;
-  blob->temp_kids = k;
-  for (r=k; r; r = r->next) 
-    k->seqno++;
-  
-  return k->seqno;
-}
-
-static int
-pgp_create_key_part (KEYBOXBLOB blob, KBNODE keyblock)
-{
-  KBNODE node;
-  size_t fprlen;
-  int n;
-
-  for (n=0, node = keyblock; node; node = node->next)
-    {
-      if ( node->pkt->pkttype == PKT_PUBLIC_KEY
-           || node->pkt->pkttype == PKT_PUBLIC_SUBKEY ) 
-        {
-          PKT_public_key *pk = node->pkt->pkt.public_key;
-          char tmp[20];
-
-          fingerprint_from_pk (pk, tmp , &fprlen);
-          memcpy (blob->keys[n].fpr, tmp, 20);
-          if ( fprlen != 20 ) /*v3 fpr - shift right and fill with zeroes*/
-            {
-              assert (fprlen == 16);
-              memmove (blob->keys[n].fpr+4, blob->keys[n].fpr, 16);
-              memset (blob->keys[n].fpr, 0, 4);
-              blob->keys[n].off_kid = pgp_temp_store_kid (blob, pk);
-	    }
-          else
-            {
-              blob->keys[n].off_kid = 0; /* will be fixed up later */
-	    }
-          blob->keys[n].flags = 0;
-          n++;
-	}
-      else if ( node->pkt->pkttype == PKT_SECRET_KEY
-		  || node->pkt->pkttype == PKT_SECRET_SUBKEY ) 
-        {
-          never_reached (); /* actually not yet implemented */
-	}
-    }
-  assert (n == blob->nkeys);
-  return 0;
-}
-
-static int
-pgp_create_uid_part (KEYBOXBLOB blob, KBNODE keyblock)
-{
-  KBNODE node;
-  int n;
-
-  for (n=0, node = keyblock; node; node = node->next)
-    {
-      if (node->pkt->pkttype == PKT_USER_ID)
-        {
-          PKT_user_id *u = node->pkt->pkt.user_id;
-          
-          blob->uids[n].len = u->len;
-          blob->uids[n].flags = 0;
-          blob->uids[n].validity = 0;
-          n++;
-	}
-    }
-  assert (n == blob->nuids);
-  return 0;
-}
-
-static int
-pgp_create_sig_part (KEYBOXBLOB blob, KBNODE keyblock)
-{
-  KBNODE node;
-  int n;
-  
-  for (n=0, node = keyblock; node; node = node->next)
-    {
-      if (node->pkt->pkttype == PKT_SIGNATURE)
-        {
-          PKT_signature *sig = node->pkt->pkt.signature;
-          
-          blob->sigs[n] = 0;	/* FIXME: check the signature here */
-          n++;
-	}
-    }
-  assert( n == blob->nsigs );
-  return 0;
-}
-
-static int
-pgp_create_blob_keyblock (KEYBOXBLOB blob, KBNODE keyblock)
-{
-  struct membuf *a = blob->buf;
-  KBNODE node;
-  int rc;
-  int n;
-  u32 kbstart = a->len;
-
-  add_fixup (blob, kbstart);
-
-  for (n = 0, node = keyblock; node; node = node->next)
-    {
-      rc = build_packet ( a, node->pkt );
-      if ( rc ) {
-        gpg_log_error ("build_packet(%d) for keyboxblob failed: %s\n",
-                      node->pkt->pkttype, gpg_errstr(rc) );
-        return GPGERR_WRITE_FILE;
-      }
-      if ( node->pkt->pkttype == PKT_USER_ID ) 
-        {
-          PKT_user_id *u = node->pkt->pkt.user_id;
-          /* build_packet has set the offset of the name into u ;
-           * now we can do the fixup */
-          add_fixup (blob, blob->uids[n].off_addr, u->stored_at);
-          n++;
-	}
-    }
-  assert (n == blob->nuids);
-
-  add_fixup (blob, a->len - kbstart);
-  return 0;
-}
- 
-#endif /*KEYBOX_WITH_OPENPGP*/
-
-
-#ifdef KEYBOX_WITH_X509
-/* 
-   X.509 specific stuff
- */
-
-/* Write the raw certificate out */
-static int
-x509_create_blob_cert (KEYBOXBLOB blob, KsbaCert cert)
-{
-  struct membuf *a = blob->buf;
-  const unsigned char *image;
-  size_t length;
-  u32 kbstart = a->len;
-
-  /* Store our offset for later fixup */
-  add_fixup (blob, 8, kbstart);
-
-  image = ksba_cert_get_image (cert, &length);
-  if (!image)
-    return gpg_error (GPG_ERR_GENERAL);
-  put_membuf (a, image, length);
-
-  add_fixup (blob, 12, a->len - kbstart);
-  return 0;
-}
- 
-#endif /*KEYBOX_WITH_X509*/
-
-/* Write a stored keyID out to the buffer */
-static void
-write_stored_kid (KEYBOXBLOB blob, int seqno)
-{
-  struct keyid_list *r;
-  
-  for ( r = blob->temp_kids; r; r = r->next ) 
-    {
-      if (r->seqno == seqno )
-        {
-          put_membuf (blob->buf, r->kid, 8);
-          return;
-	}
-    }
-  never_reached ();
-}
-
-/* Release a list of key IDs */
-static void
-release_kid_list (struct keyid_list *kl)
-{
-  struct keyid_list *r, *r2;
-  
-  for ( r = kl; r; r = r2 ) 
-    {
-      r2 = r->next;
-      xfree (r);
-    }
-}
-
-
-
-static int
-create_blob_header (KEYBOXBLOB blob, int blobtype, int as_ephemeral)
-{
-  struct membuf *a = blob->buf;
-  int i;
-
-  put32 ( a, 0 ); /* blob length, needs fixup */
-  put8 ( a, blobtype);  
-  put8 ( a, 1 );  /* blob type version */
-  put16 ( a, as_ephemeral? 2:0 ); /* blob flags */
-
-  put32 ( a, 0 ); /* offset to the raw data, needs fixup */
-  put32 ( a, 0 ); /* length of the raw data, needs fixup */
-
-  put16 ( a, blob->nkeys );
-  put16 ( a, 20 + 4 + 2 + 2 );  /* size of key info */
-  for ( i=0; i < blob->nkeys; i++ )
-    {
-      put_membuf (a, blob->keys[i].fpr, 20);
-      blob->keys[i].off_kid_addr = a->len;
-      put32 ( a, 0 ); /* offset to keyid, fixed up later */
-      put16 ( a, blob->keys[i].flags );
-      put16 ( a, 0 ); /* reserved */
-    }
-
-  put16 (a, blob->seriallen); /*fixme: check that it fits into 16 bits*/
-  if (blob->serial)
-    put_membuf (a, blob->serial, blob->seriallen);
-
-  put16 ( a, blob->nuids );
-  put16 ( a, 4 + 4 + 2 + 1 + 1 );  /* size of uid info */
-  for (i=0; i < blob->nuids; i++)
-    {
-      blob->uids[i].off_addr = a->len;
-      put32 ( a, 0 ); /* offset to userid, fixed up later */
-      put32 ( a, blob->uids[i].len );
-      put16 ( a, blob->uids[i].flags );
-      put8  ( a, 0 ); /* validity */
-      put8  ( a, 0 ); /* reserved */
-    }
-
-  put16 ( a, blob->nsigs );
-  put16 ( a, 4 );  /* size of sig info */
-  for (i=0; i < blob->nsigs; i++)
-    {
-      put32 ( a, blob->sigs[i]);
-    }
-
-  put8 ( a, 0 );  /* assigned ownertrust */
-  put8 ( a, 0 );  /* validity of all user IDs */
-  put16 ( a, 0 );  /* reserved */
-  put32 ( a, 0 );  /* time of next recheck */
-  put32 ( a, 0 );  /* newest timestamp (none) */
-  put32 ( a, make_timestamp() );  /* creation time */
-  put32 ( a, 0 );  /* size of reserved space */
-  /* reserved space (which is currently of size 0) */
-
-  /* space where we write keyIDs and and other stuff so that the
-     pointers can actually point to somewhere */
-  if (blobtype == BLOBTYPE_PGP)
-    {
-      /* We need to store the keyids for all pgp v3 keys because those key
-         IDs are not part of the fingerprint.  While we are doing that, we
-         fixup all the keyID offsets */
-      for (i=0; i < blob->nkeys; i++ )
-        {
-          if (blob->keys[i].off_kid) 
-            { /* this is a v3 one */
-              add_fixup (blob, blob->keys[i].off_kid_addr, a->len);
-              write_stored_kid (blob, blob->keys[i].off_kid);
-            }
-          else
-            { /* the better v4 key IDs - just store an offset 8 bytes back */
-              add_fixup (blob, blob->keys[i].off_kid_addr,
-                         blob->keys[i].off_kid_addr - 8); 
-            }
-        }
-    }
-  
-  if (blobtype == BLOBTYPE_X509)
-    {
-      /* We don't want to point to ASN.1 encoded UserIDs (DNs) but to
-         the utf-8 string represenation of them */
-      for (i=0; i < blob->nuids; i++ )
-        {
-          if (blob->uids[i].name) 
-            { /* this is a v3 one */
-              add_fixup (blob, blob->uids[i].off_addr, a->len);
-              put_membuf (blob->buf, blob->uids[i].name, blob->uids[i].len);
-            }
-        }
-    }
-
-    return 0;
-}
-
-
-
-static int
-create_blob_trailer (KEYBOXBLOB blob)
-{
-    return 0;
-}
-
-
-static int
-create_blob_finish (KEYBOXBLOB blob)
-{
-  struct membuf *a = blob->buf;
-  byte *p;
-  char *pp;
-  int i;
-  size_t n;
-
-  /* write a placeholder for the checksum */
-  for (i = 0; i < 16; i++ )
-    put32 (a, 0);  /* Hmmm: why put32() ?? */
-  
-  /* get the memory area */
-  p = get_membuf (a, &n);
-  if (!p)
-    return gpg_error (GPG_ERR_ENOMEM);
-  assert (n >= 20);
-
-  /* fixup the length */
-  add_fixup (blob, 0, n);
-
-  /* do the fixups */
-  if (blob->fixup_out_of_core)
-    return gpg_error (GPG_ERR_ENOMEM);
-
-  {
-    struct fixup_list *fl;
-    for (fl = blob->fixups; fl; fl = fl->next)
-      {
-        assert (fl->off+4 <= n);
-        p[fl->off+0] = fl->val >> 24;
-        p[fl->off+1] = fl->val >> 16;
-        p[fl->off+2] = fl->val >>  8;
-        p[fl->off+3] = fl->val;
-      }
-  }
-
-  /* calculate and store the MD5 checksum */
-  gcry_md_hash_buffer (GCRY_MD_MD5, p + n - 16, p, n - 16);
-
-  pp = xtrymalloc (n);
-  if ( !pp )
-    return gpg_error (gpg_err_code_from_errno (errno));
-  memcpy (pp , p, n);
-  blob->blob = pp;
-  blob->bloblen = n;
-  
-  return 0;
-}
-
-
-#ifdef KEYBOX_WITH_OPENPGP
-
-int
-_keybox_create_pgp_blob (KEYBOXBLOB *r_blob, KBNODE keyblock, int as_ephemeral)
-{
-  int rc = 0;
-  KBNODE node;
-  KEYBOXBLOB blob;
-
-  *r_blob = NULL;
-  blob = xtrycalloc (1, sizeof *blob);
-  if (!blob)
-    return gpg_error (gpg_err_code_from_errno (errno));
-
-  /* fixme: Do some sanity checks on the keyblock */
-
-  /* count userids and keys so that we can allocate the arrays */
-  for (node = keyblock; node; node = node->next) 
-    {
-      switch (node->pkt->pkttype)
-        {
-        case PKT_PUBLIC_KEY:
-        case PKT_SECRET_KEY:
-        case PKT_PUBLIC_SUBKEY:
-        case PKT_SECRET_SUBKEY: blob->nkeys++; break;
-        case PKT_USER_ID:  blob->nuids++; break;
-        case PKT_SIGNATURE: blob->nsigs++; break;
-        default: break;
-	}
-    }
-
-  blob->keys = xtrycalloc (blob->nkeys, sizeof *blob->keys );
-  blob->uids = xtrycalloc (blob->nuids, sizeof *blob->uids );
-  blob->sigs = xtrycalloc (blob->nsigs, sizeof *blob->sigs );
-  if (!blob->keys || !blob->uids || !blob->sigs)
-    {
-      rc = gpg_error (GPG_ERR_ENOMEM);
-      goto leave;
-    }
-
-  rc = pgp_create_key_part ( blob, keyblock );
-  if (rc)
-    goto leave;
-  rc = pgp_create_uid_part ( blob, keyblock );
-  if (rc)
-    goto leave;
-  rc = pgp_create_sig_part ( blob, keyblock );
-  if (rc)
-    goto leave;
-  
-  init_membuf (&blob->bufbuf, 1024);
-  blob->buf = &blob->bufbuf;
-  rc = create_blob_header (blob, BLOBTYPE_OPENPGP, as_ephemeral);
-  if (rc)
-    goto leave;
-  rc = pgp_create_blob_keyblock (blob, keyblock);
-  if (rc)
-    goto leave;
-  rc = create_blob_trailer (blob);
-  if (rc)
-    goto leave;
-  rc = create_blob_finish ( blob );
-  if (rc)
-    goto leave;
-
-  
- leave:
-  release_kid_list (blob->temp_kids);
-  blob->temp_kids = NULL;
-  if (rc)
-    {
-      keybox_release_blob (blob);
-      *r_blob = NULL;
-    }
-  else
-    {
-      *r_blob = blob;
-    }
-  return rc;
-}
-#endif /*KEYBOX_WITH_OPENPGP*/
-
-#ifdef KEYBOX_WITH_X509
-
-/* return an allocated string with the email address extracted from a
-   DN */
-static char *
-x509_email_kludge (const char *name)
-{
-  const unsigned char *p;
-  unsigned char *buf;
-  int n;
-
-  if (strncmp (name, "1.2.840.113549.1.9.1=#", 22))
-    return NULL;
-  /* This looks pretty much like an email address in the subject's DN
-     we use this to add an additional user ID entry.  This way,
-     openSSL generated keys get a nicer and usable listing */
-  name += 22;    
-  for (n=0, p=name; hexdigitp (p) && hexdigitp (p+1); p +=2, n++)
-    ;
-  if (*p != '#' || !n)
-    return NULL;
-  buf = xtrymalloc (n+3);
-  if (!buf)
-    return NULL; /* oops, out of core */
-  *buf = '<';
-  for (n=1, p=name; *p != '#'; p +=2, n++)
-    buf[n] = xtoi_2 (p);
-  buf[n++] = '>';
-  buf[n] = 0;
-  return buf;
-}
-
-
-
-/* Note: We should move calculation of the digest into libksba and
-   remove that parameter */
-int
-_keybox_create_x509_blob (KEYBOXBLOB *r_blob, KsbaCert cert,
-                          unsigned char *sha1_digest, int as_ephemeral)
-{
-  int i, rc = 0;
-  KEYBOXBLOB blob;
-  unsigned char *p;
-  unsigned char **names = NULL;
-  size_t max_names;
-
-  *r_blob = NULL;
-  blob = xtrycalloc (1, sizeof *blob);
-  if( !blob )
-    return gpg_error (gpg_err_code_from_errno (errno));
-
-  p = ksba_cert_get_serial (cert);
-  if (p)
-    {
-      size_t n, len;
-      n = gcry_sexp_canon_len (p, 0, NULL, NULL);
-      if (n < 2)
-        {
-          xfree (p);
-          return gpg_error (GPG_ERR_GENERAL);
-        }
-      blob->serialbuf = p;
-      p++; n--; /* skip '(' */
-      for (len=0; n && *p && *p != ':' && digitp (p); n--, p++)
-        len = len*10 + atoi_1 (p);
-      if (*p != ':')
-        {
-          xfree (blob->serialbuf);
-          blob->serialbuf = NULL;
-          return gpg_error (GPG_ERR_GENERAL);
-        }
-      p++;
-      blob->serial = p;
-      blob->seriallen = len;
-    }
-
-  blob->nkeys = 1;
-
-  /* create list of names */
-  blob->nuids = 0;
-  max_names = 100;
-  names = xtrymalloc (max_names * sizeof *names);
-  if (!names)
-    {
-      rc = gpg_error (gpg_err_code_from_errno (errno));
-      goto leave;
-    }
-  p = ksba_cert_get_issuer (cert, 0);
-  if (!p)
-    {
-      rc =  gpg_error (GPG_ERR_MISSING_VALUE);
-      goto leave;
-    }
-  names[blob->nuids++] = p;
-  for (i=0; (p = ksba_cert_get_subject (cert, i)); i++)
-    {
-
-      if (blob->nuids >= max_names)
-        {
-          unsigned char **tmp;
-          
-          max_names += 100;
-          tmp = xtryrealloc (names, max_names * sizeof *names);
-          if (!tmp)
-            {
-              rc = gpg_error (gpg_err_code_from_errno (errno));
-              goto leave;
-            }
-        }
-      names[blob->nuids++] = p;
-      if (!i && (p=x509_email_kludge (p)))
-        names[blob->nuids++] = p; /* due to !i we don't need to check bounds*/
-    }
-  
-  /* space for signature information */
-  blob->nsigs = 1; 
-
-  blob->keys = xtrycalloc (blob->nkeys, sizeof *blob->keys );
-  blob->uids = xtrycalloc (blob->nuids, sizeof *blob->uids );
-  blob->sigs = xtrycalloc (blob->nsigs, sizeof *blob->sigs );
-  if (!blob->keys || !blob->uids || !blob->sigs)
-    {
-      rc = gpg_error (GPG_ERR_ENOMEM);
-      goto leave;
-    }
-
-  memcpy (blob->keys[0].fpr, sha1_digest, 20);
-  blob->keys[0].off_kid = 0; /* We don't have keyids */
-  blob->keys[0].flags = 0;
-
-  /* issuer and subject names */
-  for (i=0; i < blob->nuids; i++)
-    {
-      blob->uids[i].name = names[i];
-      blob->uids[i].len = strlen(names[i]);
-      names[i] = NULL;
-      blob->uids[i].flags = 0;
-      blob->uids[i].validity = 0;
-    }
-  xfree (names);
-  names = NULL;
-
-  /* signatures */
-  blob->sigs[0] = 0;	/* not yet checked */
-
-  /* Create a temporary buffer for further processing */
-  init_membuf (&blob->bufbuf, 1024);
-  blob->buf = &blob->bufbuf;
-  /* write out what we already have */
-  rc = create_blob_header (blob, BLOBTYPE_X509, as_ephemeral);
-  if (rc)
-    goto leave;
-  rc = x509_create_blob_cert (blob, cert);
-  if (rc)
-    goto leave;
-  rc = create_blob_trailer (blob);
-  if (rc)
-    goto leave;
-  rc = create_blob_finish ( blob );
-  if (rc)
-    goto leave;
-
-  
- leave:
-  release_kid_list (blob->temp_kids);
-  blob->temp_kids = NULL;
-  if (blob && names)
-    {
-      for (i=0; i < blob->nuids; i++)
-        xfree (names[i]); 
-    }
-  xfree (names);
-  if (rc)
-    {
-      _keybox_release_blob (blob);
-      *r_blob = NULL;
-    }
-  else
-    {
-      *r_blob = blob;
-    }
-  return rc;
-}
-#endif /*KEYBOX_WITH_X509*/
-
-
-
-int
-_keybox_new_blob (KEYBOXBLOB *r_blob, char *image, size_t imagelen, off_t off)
-{
-  KEYBOXBLOB blob;
-  
-  *r_blob = NULL;
-  blob = xtrycalloc (1, sizeof *blob);
-  if (!blob)
-    return gpg_error (gpg_err_code_from_errno (errno));
-
-  blob->blob = image;
-  blob->bloblen = imagelen;
-  blob->fileoffset = off;
-  *r_blob = blob;
-  return 0;
-}
-
-void
-_keybox_release_blob (KEYBOXBLOB blob)
-{
-  int i;
-  if (!blob)
-    return;
-  /* hmmm: release membuf here?*/
-  xfree (blob->keys );
-  xfree (blob->serialbuf);
-  for (i=0; i < blob->nuids; i++)
-    xfree (blob->uids[i].name);
-  xfree (blob->uids );
-  xfree (blob->sigs );
-  xfree (blob->blob );
-  xfree (blob );
-}
-
-
-
-const char *
-_keybox_get_blob_image ( KEYBOXBLOB blob, size_t *n )
-{
-  *n = blob->bloblen;
-  return blob->blob;
-}
-
-off_t
-_keybox_get_blob_fileoffset (KEYBOXBLOB blob)
-{
-  return blob->fileoffset;
-}
-
diff --git a/kbx/keybox-defs.h b/kbx/keybox-defs.h
deleted file mode 100644
index e4578d76b..000000000
--- a/kbx/keybox-defs.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/* keybox-defs.h - interal Keybox defintions
- *	Copyright (C) 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef KEYBOX_DEFS_H
-#define KEYBOX_DEFS_H 1
-
-#include <sys/types.h> /* off_t */
-#include "keybox.h"
-
-#ifdef GPG_ERR_SOURCE_DEFAULT
-#error GPG_ERR_SOURCE_DEFAULT already defined
-#endif
-#define GPG_ERR_SOURCE_DEFAULT  GPG_ERR_SOURCE_KEYBOX
-#include <gpg-error.h>
-
-
-#ifndef HAVE_BYTE_TYPEDEF
-typedef unsigned char byte; /* fixme */
-#endif
-#ifndef HAVE_U16_TYPEDEF
-typedef unsigned short u16; /* fixme */
-#endif
-#ifndef HAVE_U32_TYPEDEF
-typedef unsigned int u32; /* fixme */
-#endif
-
-enum {
-  BLOBTYPE_EMPTY = 0,
-  BLOBTYPE_HEADER = 1,
-  BLOBTYPE_PGP = 2,
-  BLOBTYPE_X509 = 3
-};
-
-
-typedef struct keyboxblob *KEYBOXBLOB;
-
-
-typedef struct keybox_name *KB_NAME;
-typedef struct keybox_name const * CONST_KB_NAME;
-struct keybox_name {
-  struct keybox_name *next;
-  int secret;
-  /*DOTLOCK lockhd;*/
-  int is_locked;
-  int did_full_scan;
-  char fname[1];
-};
-
-
-
-struct keybox_handle {
-  CONST_KB_NAME kb;
-  int secret;             /* this is for a secret keybox */
-  FILE *fp;
-  int eof;
-  int error;
-  int ephemeral;  
-  struct {
-    KEYBOXBLOB blob;
-    off_t offset;
-    size_t pk_no;
-    size_t uid_no;
-    unsigned int n_packets; /*used for delete and update*/
-  } found;
-  struct {
-    char *name;
-    char *pattern;
-  } word_match;
-};
-
-
-/* Don't know whether this is needed: */
-/*  static struct { */
-/*    const char *homedir; */
-/*    int dry_run; */
-/*    int quiet; */
-/*    int verbose; */
-/*    int preserve_permissions; */
-/*  } keybox_opt; */
-
-
-/*-- keybox-blob.c --*/
-#ifdef KEYBOX_WITH_OPENPGP
-  /* fixme */
-#endif /*KEYBOX_WITH_OPENPGP*/
-#ifdef KEYBOX_WITH_X509
-int _keybox_create_x509_blob (KEYBOXBLOB *r_blob, KsbaCert cert,
-                              unsigned char *sha1_digest, int as_ephemeral);
-#endif /*KEYBOX_WITH_X509*/
-
-int  _keybox_new_blob (KEYBOXBLOB *r_blob, char *image, size_t imagelen,
-                       off_t off);
-void _keybox_release_blob (KEYBOXBLOB blob);
-const char *_keybox_get_blob_image (KEYBOXBLOB blob, size_t *n);
-off_t _keybox_get_blob_fileoffset (KEYBOXBLOB blob);
-
-/*-- keybox-file.c --*/
-int _keybox_read_blob (KEYBOXBLOB *r_blob, FILE *fp);
-int _keybox_write_blob (KEYBOXBLOB blob, FILE *fp);
-
-/*-- keybox-dump.c --*/
-int _keybox_dump_blob (KEYBOXBLOB blob, FILE *fp);
-int _keybox_dump_file (const char *filename, FILE *outfp);
-
-
-/*-- keybox-util.c --*/
-void *_keybox_malloc (size_t n);
-void *_keybox_calloc (size_t n, size_t m);
-void *_keybox_realloc (void *p, size_t n);
-void  _keybox_free (void *p);
-
-#define xtrymalloc(a)    _keybox_malloc ((a))
-#define xtrycalloc(a,b)  _keybox_calloc ((a),(b))
-#define xtryrealloc(a,b) _keybox_realloc((a),(b))
-#define xfree(a)         _keybox_free ((a))
-
-
-#define DIM(v) (sizeof(v)/sizeof((v)[0]))
-#define DIMof(type,member)   DIM(((type *)0)->member)
-#ifndef STR
-  #define STR(v) #v
-#endif
-#define STR2(v) STR(v)
-
-/*
-  a couple of handy macros 
-*/
-
-#define return_if_fail(expr) do {                        \
-    if (!(expr)) {                                       \
-        fprintf (stderr, "%s:%d: assertion `%s' failed\n", \
-                 __FILE__, __LINE__, #expr );            \
-        return;	                                         \
-    } } while (0)
-#define return_null_if_fail(expr) do {                   \
-    if (!(expr)) {                                       \
-        fprintf (stderr, "%s:%d: assertion `%s' failed\n", \
-                 __FILE__, __LINE__, #expr );            \
-        return NULL;	                                 \
-    } } while (0)
-#define return_val_if_fail(expr,val) do {                \
-    if (!(expr)) {                                       \
-        fprintf (stderr, "%s:%d: assertion `%s' failed\n", \
-                 __FILE__, __LINE__, #expr );            \
-        return (val);	                                 \
-    } } while (0)
-#define never_reached() do {                                   \
-        fprintf (stderr, "%s:%d: oops; should never get here\n", \
-                 __FILE__, __LINE__ );                         \
-    } while (0)
-
-
-/* some macros to replace ctype ones and avoid locale problems */
-#define digitp(p)   (*(p) >= '0' && *(p) <= '9')
-#define hexdigitp(a) (digitp (a)                     \
-                      || (*(a) >= 'A' && *(a) <= 'F')  \
-                      || (*(a) >= 'a' && *(a) <= 'f'))
-/* the atoi macros assume that the buffer has only valid digits */
-#define atoi_1(p)   (*(p) - '0' )
-#define atoi_2(p)   ((atoi_1(p) * 10) + atoi_1((p)+1))
-#define atoi_4(p)   ((atoi_2(p) * 100) + atoi_2((p)+2))
-#define xtoi_1(p)   (*(p) <= '9'? (*(p)- '0'): \
-                     *(p) <= 'F'? (*(p)-'A'+10):(*(p)-'a'+10))
-#define xtoi_2(p)   ((xtoi_1(p) * 16) + xtoi_1((p)+1))
-
-
-#endif /*KEYBOX_DEFS_H*/
-
-
diff --git a/kbx/keybox-dump.c b/kbx/keybox-dump.c
deleted file mode 100644
index 2177bedae..000000000
--- a/kbx/keybox-dump.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/* keybox-dump.c - Debug helpers
- *	Copyright (C) 2001, 2003 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#include "keybox-defs.h"
-
-static ulong
-get32 (const byte *buffer)
-{
-  ulong a;
-  a =  *buffer << 24;
-  a |= buffer[1] << 16;
-  a |= buffer[2] << 8;
-  a |= buffer[3];
-  return a;
-}
-
-static ulong
-get16 (const byte *buffer)
-{
-  ulong a;
-  a =  *buffer << 8;
-  a |= buffer[1];
-  return a;
-}
-
-void
-print_string (FILE *fp, const byte *p, size_t n, int delim)
-{
-  for ( ; n; n--, p++ )
-    {
-      if (*p < 0x20 || (*p >= 0x7f && *p < 0xa0) || *p == delim)
-        {
-          putc('\\', fp);
-          if( *p == '\n' )
-            putc('n', fp);
-          else if( *p == '\r' )
-            putc('r', fp);
-          else if( *p == '\f' )
-            putc('f', fp);
-          else if( *p == '\v' )
-            putc('v', fp);
-          else if( *p == '\b' )
-            putc('b', fp);
-          else if( !*p )
-            putc('0', fp);
-          else
-            fprintf(fp, "x%02x", *p );
-	}
-      else
-        putc(*p, fp);
-    }
-}
-
-
-static int
-dump_header_blob (const byte *buffer, size_t length, FILE *fp)
-{
-  fprintf (fp, "Version: %d\n", buffer[5]);
-  if ( memcmp (buffer+8, "KBXf", 4))
-    fprintf (fp, "[Error: invalid magic number]\n");
-  return 0;
-}
-
-
-/* Dump one block to FP */
-int
-_keybox_dump_blob (KEYBOXBLOB blob, FILE *fp)
-{
-  const byte *buffer;
-  size_t length;
-  int type;
-  ulong n, nkeys, keyinfolen;
-  ulong nuids, uidinfolen;
-  ulong nsigs, siginfolen;
-  ulong rawdata_off, rawdata_len;
-  ulong nserial;
-  const byte *p;
-
-  buffer = _keybox_get_blob_image (blob, &length);
-  
-  if (length < 40)
-    {
-      fprintf (fp, "[blob too short]\n");
-      return -1;
-    }
-
-  n = get32( buffer );
-  if (n > length) 
-    fprintf (fp, "[blob larger than length - output truncated]\n");
-  else
-    length = n;  /* ignore the rest */
-
-  fprintf (fp, "Length: %lu\n", n );
-  type = buffer[4];
-  switch (type)
-    {
-    case BLOBTYPE_EMPTY:
-      fprintf (fp, "Type:   Empty\n");
-      return 0;
-
-    case BLOBTYPE_HEADER:
-      fprintf (fp, "Type:   Header\n");
-      return dump_header_blob (buffer, length, fp);
-    case BLOBTYPE_PGP:
-      fprintf (fp, "Type:   OpenPGP\n");
-      break;
-    case BLOBTYPE_X509:
-      fprintf (fp, "Type:   X.509\n");
-      break;
-    default:
-      fprintf (fp, "Type:   %d\n", type);
-      fprintf (fp, "[can't dump this blob type]\n");
-      return 0;
-    }
-  fprintf (fp, "Version: %d\n", buffer[5]);
-  
-  n = get16 (buffer + 6);
-  fprintf( fp, "Blob-Flags: %04lX", n);
-  if (n)
-    {
-      int any = 0;
-
-      fputs (" (", fp);
-      if ((n & 1))
-        {
-          fputs ("secret", fp);
-          any++;
-        }
-      if ((n & 2))
-        {
-          if (any)
-            putc (',', fp);
-          fputs ("ephemeral", fp);
-          any++;
-        }
-      putc (')', fp);
-    }
-  putc ('\n', fp);
-
-  rawdata_off = get32 (buffer + 8);
-  rawdata_len = get32 (buffer + 12);
-
-  fprintf( fp, "Data-Offset: %lu\n", rawdata_off );
-  fprintf( fp, "Data-Length: %lu\n", rawdata_len );
-
-  nkeys = get16 (buffer + 16);
-  fprintf (fp, "Key-Count: %lu\n", nkeys );
-  if (!nkeys)
-    fprintf (fp, "[Error: no keys]\n");
-  if (nkeys > 1 && type == BLOBTYPE_X509)
-    fprintf (fp, "[Error: only one key allowed for X509]\n");
-
-  keyinfolen = get16 (buffer + 18 );
-  fprintf (fp, "Key-Info-Length: %lu\n", keyinfolen);
-  /* fixme: check bounds */
-  p = buffer + 20;
-  for (n=0; n < nkeys; n++, p += keyinfolen)
-    {
-      int i;
-      ulong kidoff, kflags;
-    
-      fprintf (fp, "Key-Fpr[%lu]: ", n );
-      for (i=0; i < 20; i++ )
-        fprintf (fp, "%02X", p[i]);
-      kidoff = get32 (p + 20);
-      fprintf (fp, "\nKey-Kid-Off[%lu]: %lu\n", n, kidoff );
-      fprintf (fp, "Key-Kid[%lu]: ", n );
-      /* fixme: check bounds */
-      for (i=0; i < 8; i++ )
-        fprintf (fp, "%02X", buffer[kidoff+i] );
-      kflags = get16 (p + 24 );
-      fprintf( fp, "\nKey-Flags[%lu]: %04lX\n", n, kflags);
-    }
-  
-  /* serial number */
-  fputs ("Serial-No: ", fp);
-  nserial = get16 (p);
-  p += 2;
-  if (!nserial)
-    fputs ("none", fp);
-  else
-    {
-      for (; nserial; nserial--, p++)
-        fprintf (fp, "%02X", *p);
-    }
-  putc ('\n', fp);
-
-  /* user IDs */
-  nuids = get16 (p);
-  fprintf (fp, "Uid-Count: %lu\n", nuids );
-  uidinfolen = get16  (p + 2);
-  fprintf (fp, "Uid-Info-Length: %lu\n", uidinfolen);
-  /* fixme: check bounds */
-  p += 4;
-  for (n=0; n < nuids; n++, p += uidinfolen)
-    {
-      ulong uidoff, uidlen, uflags;
-      
-      uidoff = get32( p );
-      uidlen = get32( p+4 );
-      if (type == BLOBTYPE_X509 && !n)
-        {
-          fprintf (fp, "Issuer-Off: %lu\n", uidoff );
-          fprintf (fp, "Issuer-Len: %lu\n", uidlen );
-          fprintf (fp, "Issuer: \"");
-        }
-      else if (type == BLOBTYPE_X509 && n == 1)
-        {
-          fprintf (fp, "Subject-Off: %lu\n", uidoff );
-          fprintf (fp, "Subject-Len: %lu\n", uidlen );
-          fprintf (fp, "Subject: \"");
-        }
-      else
-        {
-          fprintf (fp, "Uid-Off[%lu]: %lu\n", n, uidoff );
-          fprintf (fp, "Uid-Len[%lu]: %lu\n", n, uidlen );
-          fprintf (fp, "Uid[%lu]: \"", n );
-        }
-      print_string (fp, buffer+uidoff, uidlen, '\"');
-      fputs ("\"\n", fp);
-      uflags = get16 (p + 8);
-      if (type == BLOBTYPE_X509 && !n)
-        {
-          fprintf (fp, "Issuer-Flags: %04lX\n", uflags );
-          fprintf (fp, "Issuer-Validity: %d\n", p[10] );
-        }
-      else if (type == BLOBTYPE_X509 && n == 1)
-        {
-          fprintf (fp, "Subject-Flags: %04lX\n", uflags );
-          fprintf (fp, "Subject-Validity: %d\n", p[10] );
-        }
-      else
-        {
-          fprintf (fp, "Uid-Flags[%lu]: %04lX\n", n, uflags );
-          fprintf (fp, "Uid-Validity[%lu]: %d\n", n, p[10] );
-        }
-    }
-  
-  nsigs = get16 (p);
-  fprintf (fp, "Sig-Count: %lu\n", nsigs );
-  siginfolen = get16 (p + 2);
-  fprintf (fp, "Sig-Info-Length: %lu\n", siginfolen );
-  /* fixme: check bounds  */
-  p += 4;
-  for (n=0; n < nsigs; n++, p += siginfolen)
-    {
-      ulong sflags;
-    
-      sflags = get32 (p);
-      fprintf (fp, "Sig-Expire[%lu]: ", n );
-      if (!sflags)
-        fputs ("[not checked]", fp);
-      else if (sflags == 1 )
-        fputs ("[missing key]", fp);
-      else if (sflags == 2 )
-        fputs ("[bad signature]", fp);
-      else if (sflags < 0x10000000)
-        fprintf (fp, "[bad flag %0lx]", sflags);
-      else if (sflags == 0xffffffff)
-        fputs ("0", fp );
-      else
-        fputs ("a time"/*strtimestamp( sflags )*/, fp );
-      putc ('\n', fp );
-    }
-
-  fprintf (fp, "Ownertrust: %d\n", p[0] );
-  fprintf (fp, "All-Validity: %d\n", p[1] );
-  p += 4;
-  n = get32 (p); p += 4;
-  fprintf (fp, "Recheck-After: %s\n", /*n? strtimestamp(n) :*/ "0" );
-  n = get32 (p ); p += 4;
-  fprintf( fp, "Latest-Timestamp: %s\n", "0"/*strtimestamp(n)*/ );
-  n = get32 (p ); p += 4;
-  fprintf (fp, "Created-At: %s\n", "0"/*strtimestamp(n)*/ );
-  n = get32 (p ); p += 4;
-  fprintf (fp, "Reserved-Space: %lu\n", n );
-
-  /* check that the keyblock is at the correct offset and other bounds */
-  /*fprintf (fp, "Blob-Checksum: [MD5-hash]\n");*/
-  return 0;
-}
-
-
-
-int
-_keybox_dump_file (const char *filename, FILE *outfp)
-{
-  FILE *fp;
-  KEYBOXBLOB blob;
-  int rc;
-  unsigned long count = 0;
-
-  if (!filename)
-    {
-      filename = "-";
-      fp = stdin;
-    }
-  else
-    fp = fopen (filename, "rb");
-  if (!fp)
-    {
-      gpg_error_t tmperr = gpg_error (gpg_err_code_from_errno (errno));
-      fprintf (outfp, "can't open `%s': %s\n", filename, strerror(errno));
-      return tmperr;
-    }
-
-  while ( !(rc = _keybox_read_blob (&blob, fp)) )
-    {
-      fprintf (outfp, "BEGIN-RECORD: %lu\n", count );
-      _keybox_dump_blob (blob, outfp);
-      _keybox_release_blob (blob);
-      fprintf (outfp, "END-RECORD\n");
-      count++;
-    }
-  if (rc == -1)
-    rc = 0;
-  if (rc)
-    fprintf (outfp, "error reading `%s': %s\n", filename, gpg_strerror (rc));
-  
-  if (fp != stdin)
-    fclose (fp);
-  return rc;
-}
diff --git a/kbx/keybox-errors.c b/kbx/keybox-errors.c
deleted file mode 100644
index e11efc10b..000000000
--- a/kbx/keybox-errors.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Generated automatically by mkerrors */
-/* Do not edit! */
-
-#include <stdio.h>
-#include "keybox-defs.h"
-
-/**
- * keybox_strerror:
- * @err:  Error code 
- * 
- * This function returns a textual representaion of the given
- * errorcode. If this is an unknown value, a string with the value
- * is returned (Beware: it is hold in a static buffer).
- * 
- * Return value: String with the error description.
- **/
-const char *
-keybox_strerror (KeyboxError err)
-{
-  const char *s;
-  static char buf[25];
-
-  switch (err)
-    {
-    case KEYBOX_No_Error: s="no error"; break;
-    case KEYBOX_General_Error: s="general error"; break;
-    case KEYBOX_Out_Of_Core: s="out of core"; break;
-    case KEYBOX_Invalid_Value: s="invalid value"; break;
-    case KEYBOX_Timeout: s="timeout"; break;
-    case KEYBOX_Read_Error: s="read error"; break;
-    case KEYBOX_Write_Error: s="write error"; break;
-    case KEYBOX_File_Error: s="file error"; break;
-    case KEYBOX_Blob_Too_Short: s="blob too short"; break;
-    case KEYBOX_Blob_Too_Large: s="blob too large"; break;
-    case KEYBOX_Invalid_Handle: s="invalid handle"; break;
-    case KEYBOX_File_Create_Error: s="file create error"; break;
-    case KEYBOX_File_Open_Error: s="file open error"; break;
-    case KEYBOX_File_Close_Error: s="file close error"; break;
-    case KEYBOX_Nothing_Found: s="nothing found"; break;
-    case KEYBOX_Wrong_Blob_Type: s="wrong blob type"; break;
-    case KEYBOX_Missing_Value: s="missing value"; break;
-    default:  sprintf (buf, "ec=%d", err ); s=buf; break;
-    }
-
-  return s;
-}
-
diff --git a/kbx/keybox-file.c b/kbx/keybox-file.c
deleted file mode 100644
index fc9321478..000000000
--- a/kbx/keybox-file.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* keybox-file.c - file oeprations
- *	Copyright (C) 2001, 2003 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#include "keybox-defs.h"
-
-/* Read a block at the current postion and return it in r_blob.
-   r_blob may be NULL to simply skip the current block */
-int
-_keybox_read_blob (KEYBOXBLOB *r_blob, FILE *fp)
-{
-  char *image;
-  size_t imagelen = 0;
-  int c1, c2, c3, c4, type;
-  int rc;
-  off_t off;
-
- again:
-  *r_blob = NULL;
-  off = ftello (fp);
-  if (off == (off_t)-1)
-    return gpg_error (gpg_err_code_from_errno (errno));
-
-  if ((c1 = getc (fp)) == EOF
-      || (c2 = getc (fp)) == EOF
-      || (c3 = getc (fp)) == EOF
-      || (c4 = getc (fp)) == EOF
-      || (type = getc (fp)) == EOF)
-    {
-      if ( c1 == EOF && !ferror (fp) )
-        return -1; /* eof */
-      return gpg_error (gpg_err_code_from_errno (errno));
-    }
-
-  imagelen = (c1 << 24) | (c2 << 16) | (c3 << 8 ) | c4;
-  if (imagelen > 500000) /* sanity check */
-    return gpg_error (GPG_ERR_TOO_LARGE);
-  
-  if (imagelen < 5) 
-    return gpg_error (GPG_ERR_TOO_SHORT);
-
-  if (!type)
-    {
-      /* special treatment for empty blobs. */
-      if (fseek (fp, imagelen-5, SEEK_CUR))
-        return gpg_error (gpg_err_code_from_errno (errno));
-      goto again;
-    }
-
-  image = xtrymalloc (imagelen);
-  if (!image) 
-    return gpg_error (gpg_err_code_from_errno (errno));
-
-  image[0] = c1; image[1] = c2; image[2] = c3; image[3] = c4; image[4] = type;
-  if (fread (image+5, imagelen-5, 1, fp) != 1)
-    {
-      gpg_error_t tmperr = gpg_error (gpg_err_code_from_errno (errno));
-      xfree (image);
-      return tmperr;
-    }
-  
-  rc = r_blob? _keybox_new_blob (r_blob, image, imagelen, off) : 0;
-  if (rc || !r_blob)
-        xfree (image);
-  return rc;
-}
-
-
-/* Write the block to the current file position */
-int
-_keybox_write_blob (KEYBOXBLOB blob, FILE *fp)
-{
-  const char *image;
-  size_t length;
-
-  image = _keybox_get_blob_image (blob, &length);
-  if (fwrite (image, length, 1, fp) != 1)
-    return gpg_error (gpg_err_code_from_errno (errno));
-  return 0;
-}
diff --git a/kbx/keybox-init.c b/kbx/keybox-init.c
deleted file mode 100644
index e11c4f09c..000000000
--- a/kbx/keybox-init.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* keybox-init.c - Initalization of the library 
- *	Copyright (C) 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <assert.h>
-
-#include "keybox-defs.h"
-
-#define compare_filenames strcmp
-
-static KB_NAME kb_names;
-
-
-/* 
-  Register a filename for plain keybox files.  Returns a pointer to be
-  used to create a handles etc or NULL to indicate that it has already
-  been registered */
-void *
-keybox_register_file (const char *fname, int secret)
-{
-  KB_NAME kr;
-
-  for (kr=kb_names; kr; kr = kr->next)
-    {
-      if ( !compare_filenames (kr->fname, fname) )
-        return NULL; /* already registered */
-    }
-
-  kr = xtrymalloc (sizeof *kr + strlen (fname));
-  if (!kr)
-    return NULL;
-  strcpy (kr->fname, fname);
-  kr->secret = !!secret;
-  /* kr->lockhd = NULL;*/
-  kr->is_locked = 0;
-  kr->did_full_scan = 0;
-  /* keep a list of all issued pointers */
-  kr->next = kb_names;
-  kb_names = kr;
-  
-  /* create the offset table the first time a function here is used */
-/*      if (!kb_offtbl) */
-/*        kb_offtbl = new_offset_hash_table (); */
-
-  return kr;
-}
-
-int
-keybox_is_writable (void *token)
-{
-  KB_NAME r = token;
-
-  return r? !access (r->fname, W_OK) : 0;
-}
-
-    
-
-/* Create a new handle for the resource associated with TOKEN.  SECRET
-   is just a cross-check.
-   
-   The returned handle must be released using keybox_release (). */
-KEYBOX_HANDLE
-keybox_new (void *token, int secret)
-{
-  KEYBOX_HANDLE hd;
-  KB_NAME resource = token;
-
-  assert (resource && !resource->secret == !secret);
-  hd = xtrycalloc (1, sizeof *hd);
-  if (hd)
-    {
-      hd->kb = resource;
-      hd->secret = !!secret;
-    }
-  return hd;
-}
-
-void 
-keybox_release (KEYBOX_HANDLE hd)
-{
-  if (!hd)
-    return;
-  _keybox_release_blob (hd->found.blob);
-  xfree (hd->word_match.name);
-  xfree (hd->word_match.pattern);
-  xfree (hd);
-}
-
-
-const char *
-keybox_get_resource_name (KEYBOX_HANDLE hd)
-{
-  if (!hd || !hd->kb)
-    return NULL;
-  return hd->kb->fname;
-}
-
-int
-keybox_set_ephemeral (KEYBOX_HANDLE hd, int yes)
-{
-  if (!hd)
-    return gpg_error (GPG_ERR_INV_HANDLE); 
-  hd->ephemeral = yes;
-  return 0;
-}
-
diff --git a/kbx/keybox-search-desc.h b/kbx/keybox-search-desc.h
deleted file mode 100644
index 4be59c27d..000000000
--- a/kbx/keybox-search-desc.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* keybox-search-desc.h - Keybox serch description
- *	Copyright (C) 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-/* 
-   This file is a temporary kludge until we can come up with solution
-   to share this description between keybox and the application
-   specific keydb
-*/
-
-#ifndef KEYBOX_SEARCH_DESC_H
-#define KEYBOX_SEARCH_DESC_H 1
-
-typedef enum {
-  KEYDB_SEARCH_MODE_NONE,
-  KEYDB_SEARCH_MODE_EXACT,
-  KEYDB_SEARCH_MODE_SUBSTR,
-  KEYDB_SEARCH_MODE_MAIL,
-  KEYDB_SEARCH_MODE_MAILSUB,
-  KEYDB_SEARCH_MODE_MAILEND,
-  KEYDB_SEARCH_MODE_WORDS,
-  KEYDB_SEARCH_MODE_SHORT_KID,
-  KEYDB_SEARCH_MODE_LONG_KID,
-  KEYDB_SEARCH_MODE_FPR16,
-  KEYDB_SEARCH_MODE_FPR20,
-  KEYDB_SEARCH_MODE_FPR,
-  KEYDB_SEARCH_MODE_ISSUER,
-  KEYDB_SEARCH_MODE_ISSUER_SN,
-  KEYDB_SEARCH_MODE_SN,
-  KEYDB_SEARCH_MODE_SUBJECT,
-  KEYDB_SEARCH_MODE_FIRST,
-  KEYDB_SEARCH_MODE_NEXT
-} KeydbSearchMode;
-
-struct keydb_search_desc {
-  KeydbSearchMode mode;
-  int (*skipfnc)(void *,void*); /* used to be: void*, u32* */
-  void *skipfncvalue;
-  const unsigned char *sn; 
-  int snlen;  /* -1 := sn is a hex string */
-  union {
-    const char *name;
-    unsigned char fpr[24];
-    unsigned char kid[8]; 
-  } u;
-};
-
-
-struct keydb_search_desc;
-typedef struct keydb_search_desc KEYDB_SEARCH_DESC;
-
-typedef struct keydb_search_desc KEYBOX_SEARCH_DESC;
-
-
-
-#endif /*KEYBOX_SEARCH_DESC_H*/
diff --git a/kbx/keybox-search.c b/kbx/keybox-search.c
deleted file mode 100644
index 231a32d42..000000000
--- a/kbx/keybox-search.c
+++ /dev/null
@@ -1,813 +0,0 @@
-/* keybox-search.c - Search operations
- *	Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <errno.h>
-
-#include "../jnlib/stringhelp.h" /* ascii_xxxx() */
-#include "keybox-defs.h"
-
-#define xtoi_1(p)   (*(p) <= '9'? (*(p)- '0'): \
-                     *(p) <= 'F'? (*(p)-'A'+10):(*(p)-'a'+10))
-#define xtoi_2(p)   ((xtoi_1(p) * 16) + xtoi_1((p)+1))
-
-struct sn_array_s {
-    int snlen;
-    unsigned char *sn;
-};
-
-
-
-static ulong
-get32 (const byte *buffer)
-{
-  ulong a;
-  a =  *buffer << 24;
-  a |= buffer[1] << 16;
-  a |= buffer[2] << 8;
-  a |= buffer[3];
-  return a;
-}
-
-static ulong
-get16 (const byte *buffer)
-{
-  ulong a;
-  a =  *buffer << 8;
-  a |= buffer[1];
-  return a;
-}
-
-
-
-static int
-blob_get_type (KEYBOXBLOB blob)
-{
-  const unsigned char *buffer;
-  size_t length;
-
-  buffer = _keybox_get_blob_image (blob, &length);
-  if (length < 40)
-    return -1; /* blob too short */
-
-  return buffer[4];
-}
-
-static unsigned int
-blob_get_blob_flags (KEYBOXBLOB blob)
-{
-  const unsigned char *buffer;
-  size_t length;
-
-  buffer = _keybox_get_blob_image (blob, &length);
-  if (length < 8)
-    return 0; /* oops */
-
-  return get16 (buffer + 6);
-}
-
-
-static int
-blob_cmp_sn (KEYBOXBLOB blob, const unsigned char *sn, int snlen)
-{
-  const unsigned char *buffer;
-  size_t length;
-  size_t pos, off;
-  size_t nkeys, keyinfolen;
-  size_t nserial;
-
-  buffer = _keybox_get_blob_image (blob, &length);
-  if (length < 40)
-    return 0; /* blob too short */
-
-  /*keys*/
-  nkeys = get16 (buffer + 16);
-  keyinfolen = get16 (buffer + 18 );
-  if (keyinfolen < 28)
-    return 0; /* invalid blob */
-  pos = 20 + keyinfolen*nkeys;
-  if (pos+2 > length)
-    return 0; /* out of bounds */
-
-  /*serial*/
-  nserial = get16 (buffer+pos); 
-  off = pos + 2;
-  if (off+nserial > length)
-    return 0; /* out of bounds */
-
-  return nserial == snlen && !memcmp (buffer+off, sn, snlen);
-}
-
-
-static int
-blob_cmp_fpr (KEYBOXBLOB blob, const unsigned char *fpr)
-{
-  const unsigned char *buffer;
-  size_t length;
-  size_t pos, off;
-  size_t nkeys, keyinfolen;
-  int idx;
-
-  buffer = _keybox_get_blob_image (blob, &length);
-  if (length < 40)
-    return 0; /* blob too short */
-
-  /*keys*/
-  nkeys = get16 (buffer + 16);
-  keyinfolen = get16 (buffer + 18 );
-  if (keyinfolen < 28)
-    return 0; /* invalid blob */
-  pos = 20;
-  if (pos + keyinfolen*nkeys > length)
-    return 0; /* out of bounds */
-
-  for (idx=0; idx < nkeys; idx++)
-    {
-      off = pos + idx*keyinfolen;
-      if (!memcmp (buffer + off, fpr, 20))
-        return 1; /* found */
-    }
-  return 0; /* not found */
-}
-
-static int
-blob_cmp_fpr_part (KEYBOXBLOB blob, const unsigned char *fpr,
-                   int fproff, int fprlen)
-{
-  const unsigned char *buffer;
-  size_t length;
-  size_t pos, off;
-  size_t nkeys, keyinfolen;
-  int idx;
-
-  buffer = _keybox_get_blob_image (blob, &length);
-  if (length < 40)
-    return 0; /* blob too short */
-
-  /*keys*/
-  nkeys = get16 (buffer + 16);
-  keyinfolen = get16 (buffer + 18 );
-  if (keyinfolen < 28)
-    return 0; /* invalid blob */
-  pos = 20;
-  if (pos + keyinfolen*nkeys > length)
-    return 0; /* out of bounds */
-
-  for (idx=0; idx < nkeys; idx++)
-    {
-      off = pos + idx*keyinfolen;
-      if (!memcmp (buffer + off + fproff, fpr, fprlen))
-        return 1; /* found */
-    }
-  return 0; /* not found */
-}
-
-
-static int
-blob_cmp_name (KEYBOXBLOB blob, int idx,
-               const char *name, size_t namelen, int substr)
-{
-  const unsigned char *buffer;
-  size_t length;
-  size_t pos, off, len;
-  size_t nkeys, keyinfolen;
-  size_t nuids, uidinfolen;
-  size_t nserial;
-
-  buffer = _keybox_get_blob_image (blob, &length);
-  if (length < 40)
-    return 0; /* blob too short */
-
-  /*keys*/
-  nkeys = get16 (buffer + 16);
-  keyinfolen = get16 (buffer + 18 );
-  if (keyinfolen < 28)
-    return 0; /* invalid blob */
-  pos = 20 + keyinfolen*nkeys;
-  if (pos+2 > length)
-    return 0; /* out of bounds */
-
-  /*serial*/
-  nserial = get16 (buffer+pos); 
-  pos += 2 + nserial;
-  if (pos+4 > length)
-    return 0; /* out of bounds */
-
-  /* user ids*/
-  nuids = get16 (buffer + pos);  pos += 2;
-  uidinfolen = get16 (buffer + pos);  pos += 2;
-  if (uidinfolen < 12 /* should add a: || nuidinfolen > MAX_UIDINFOLEN */)
-    return 0; /* invalid blob */
-  if (pos + uidinfolen*nuids > length)
-    return 0; /* out of bounds */
-
-  if (idx < 0)
-    { /* compare all names starting with that (negated) index */
-      idx = -idx;
-      
-      for ( ;idx < nuids; idx++)
-        {
-          size_t mypos = pos;
-
-          mypos += idx*uidinfolen;
-          off = get32 (buffer+mypos);
-          len = get32 (buffer+mypos+4);
-          if (off+len > length)
-            return 0; /* error: better stop here out of bounds */
-          if (len < 1)
-            continue; /* empty name */
-          if (substr)
-            {
-              if (ascii_memcasemem (buffer+off, len, name, namelen))
-                return 1; /* found */
-            }
-          else
-            {
-              if (len == namelen && !memcmp (buffer+off, name, len))
-                return 1; /* found */
-            }
-        }
-      return 0; /* not found */
-    }
-  else
-    {
-      if (idx > nuids)
-        return 0; /* no user ID with that idx */
-      pos += idx*uidinfolen;
-      off = get32 (buffer+pos);
-      len = get32 (buffer+pos+4);
-      if (off+len > length)
-        return 0; /* out of bounds */
-      if (len < 1)
-        return 0; /* empty name */
-
-      if (substr)
-        {
-          return !!ascii_memcasemem (buffer+off, len, name, namelen);
-        }
-      else
-        {
-          return len == namelen && !memcmp (buffer+off, name, len);
-        }
-    }
-}
-
-
-/* compare all email addresses of the subject.  With SUBSTR given as
-   True a substring search is done in the mail address */
-static int
-blob_cmp_mail (KEYBOXBLOB blob, const char *name, size_t namelen, int substr)
-{
-  const unsigned char *buffer;
-  size_t length;
-  size_t pos, off, len;
-  size_t nkeys, keyinfolen;
-  size_t nuids, uidinfolen;
-  size_t nserial;
-  int idx;
-
-  /* fixme: this code is common to blob_cmp_mail */
-  buffer = _keybox_get_blob_image (blob, &length);
-  if (length < 40)
-    return 0; /* blob too short */
-
-  /*keys*/
-  nkeys = get16 (buffer + 16);
-  keyinfolen = get16 (buffer + 18 );
-  if (keyinfolen < 28)
-    return 0; /* invalid blob */
-  pos = 20 + keyinfolen*nkeys;
-  if (pos+2 > length)
-    return 0; /* out of bounds */
-
-  /*serial*/
-  nserial = get16 (buffer+pos); 
-  pos += 2 + nserial;
-  if (pos+4 > length)
-    return 0; /* out of bounds */
-
-  /* user ids*/
-  nuids = get16 (buffer + pos);  pos += 2;
-  uidinfolen = get16 (buffer + pos);  pos += 2;
-  if (uidinfolen < 12 /* should add a: || nuidinfolen > MAX_UIDINFOLEN */)
-    return 0; /* invalid blob */
-  if (pos + uidinfolen*nuids > length)
-    return 0; /* out of bounds */
-
-  if (namelen < 1)
-    return 0;
-
-  for (idx=1 ;idx < nuids; idx++)
-    {
-      size_t mypos = pos;
-      
-      mypos += idx*uidinfolen;
-      off = get32 (buffer+mypos);
-      len = get32 (buffer+mypos+4);
-      if (off+len > length)
-        return 0; /* error: better stop here out of bounds */
-      if (len < 2 || buffer[off] != '<')
-        continue; /* empty name or trailing 0 not stored */
-      len--; /* one back */
-      if ( len < 3 || buffer[off+len] != '>')
-        continue; /* not a proper email address */
-      len--; 
-      if (substr)
-        {
-          if (ascii_memcasemem (buffer+off+1, len, name, namelen))
-            return 1; /* found */
-        }
-      else
-        {
-          if (len == namelen && !ascii_memcasecmp (buffer+off+1, name, len))
-            return 1; /* found */
-        }
-    }
-  return 0; /* not found */
-}
-
-
-
-
-/*
-  The has_foo functions are used as helpers for search 
-*/
-static int
-has_short_kid (KEYBOXBLOB blob, const unsigned char *kid)
-{
-  return blob_cmp_fpr_part (blob, kid+4, 16, 4);
-}
-
-static int
-has_long_kid (KEYBOXBLOB blob, const unsigned char *kid)
-{
-  return blob_cmp_fpr_part (blob, kid, 12, 8);
-}
-
-static int
-has_fingerprint (KEYBOXBLOB blob, const unsigned char *fpr)
-{
-  return blob_cmp_fpr (blob, fpr);
-}
-
-
-static int
-has_issuer (KEYBOXBLOB blob, const char *name)
-{
-  size_t namelen;
-
-  return_val_if_fail (name, 0);
-
-  if (blob_get_type (blob) != BLOBTYPE_X509)
-    return 0;
-
-  namelen = strlen (name);
-  return blob_cmp_name (blob, 0 /* issuer */, name, namelen, 0);
-}
-
-static int
-has_issuer_sn (KEYBOXBLOB blob, const char *name,
-               const unsigned char *sn, int snlen)
-{
-  size_t namelen;
-
-  return_val_if_fail (name, 0);
-  return_val_if_fail (sn, 0);
-
-  if (blob_get_type (blob) != BLOBTYPE_X509)
-    return 0;
-
-  namelen = strlen (name);
-  
-  return (blob_cmp_sn (blob, sn, snlen)
-          && blob_cmp_name (blob, 0 /* issuer */, name, namelen, 0));
-}
-
-static int
-has_sn (KEYBOXBLOB blob, const unsigned char *sn, int snlen)
-{
-  return_val_if_fail (sn, 0);
-
-  if (blob_get_type (blob) != BLOBTYPE_X509)
-    return 0;
-  return blob_cmp_sn (blob, sn, snlen);
-}
-
-static int
-has_subject (KEYBOXBLOB blob, const char *name)
-{
-  size_t namelen;
-
-  return_val_if_fail (name, 0);
-
-  if (blob_get_type (blob) != BLOBTYPE_X509)
-    return 0;
-
-  namelen = strlen (name);
-  return blob_cmp_name (blob, 1 /* subject */, name, namelen, 0);
-}
-
-static int
-has_subject_or_alt (KEYBOXBLOB blob, const char *name, int substr)
-{
-  size_t namelen;
-
-  return_val_if_fail (name, 0);
-
-  if (blob_get_type (blob) != BLOBTYPE_X509)
-    return 0;
-
-  namelen = strlen (name);
-  return blob_cmp_name (blob, -1 /* all subject names*/, name,
-                        namelen, substr);
-}
-
-
-static int
-has_mail (KEYBOXBLOB blob, const char *name, int substr)
-{
-  size_t namelen;
-
-  return_val_if_fail (name, 0);
-
-  if (blob_get_type (blob) != BLOBTYPE_X509)
-    return 0;
-
-  namelen = strlen (name);
-  if (namelen && name[namelen-1] == '>')
-    namelen--;
-  return blob_cmp_mail (blob, name, namelen, substr);
-}
-
-
-static void
-release_sn_array (struct sn_array_s *array, size_t size)
-{
-  size_t n;
-
-  for (n=0; n < size; n++)
-    xfree (array[n].sn);
-  xfree (array);
-}
-
-
-/*
-
-  The search API
-
-*/
-
-int 
-keybox_search_reset (KEYBOX_HANDLE hd)
-{
-  if (!hd)
-    return gpg_error (GPG_ERR_INV_VALUE);
-
-  if (hd->found.blob)
-    {
-      _keybox_release_blob (hd->found.blob);
-      hd->found.blob = NULL;
-    }
-
-  if (hd->fp)
-    {
-      fclose (hd->fp);
-      hd->fp = NULL;
-    }
-  hd->error = 0;
-  hd->eof = 0;
-  return 0;   
-}
-
-
-/* Note: When in ephemeral mode the search function does visit all
-   blobs but in standard mode, blobs flagged as ephemeral are ignored.  */
-int 
-keybox_search (KEYBOX_HANDLE hd, KEYBOX_SEARCH_DESC *desc, size_t ndesc)
-{
-  int rc;
-  size_t n;
-  int need_words, any_skip;
-  KEYBOXBLOB blob = NULL;
-  struct sn_array_s *sn_array = NULL;
-
-  if (!hd)
-    return gpg_error (GPG_ERR_INV_VALUE);
-
-  /* clear last found result */
-  if (hd->found.blob)
-    {
-      _keybox_release_blob (hd->found.blob);
-      hd->found.blob = NULL;
-    }
-
-  if (hd->error)  
-    return hd->error; /* still in error state */
-  if (hd->eof)  
-    return -1; /* still EOF */
-
-  /* figure out what information we need */
-  need_words = any_skip = 0;
-  for (n=0; n < ndesc; n++) 
-    {
-      switch (desc[n].mode) 
-        {
-        case KEYDB_SEARCH_MODE_WORDS: 
-          need_words = 1;
-          break;
-        case KEYDB_SEARCH_MODE_FIRST:
-          /* always restart the search in this mode */
-          keybox_search_reset (hd);
-          break;
-        default:
-          break;
-	}
-      if (desc[n].skipfnc) 
-        any_skip = 1;
-      if (desc[n].snlen == -1 && !sn_array)
-        {
-          sn_array = xtrycalloc (ndesc, sizeof *sn_array);
-          if (!sn_array)
-            return (hd->error = gpg_error (gpg_err_code_from_errno (errno)));
-        }
-    }
-
-  if (!hd->fp)
-    {
-      hd->fp = fopen (hd->kb->fname, "rb");
-      if (!hd->fp)
-        {
-          hd->error = gpg_error (gpg_err_code_from_errno (errno));
-          xfree (sn_array);
-          return hd->error;
-        }
-    }
-
-  /* kludge: we need to convert an SN given as hexstring to it's
-     binary representation - in some cases we are not able to store it
-     in the search descriptor, because due to its usgae it is not
-     possible to free allocated memory */
-  if (sn_array)
-    {
-      const unsigned char *s;
-      int i, odd;
-      size_t snlen;
-
-      for (n=0; n < ndesc; n++) 
-        {
-          if (!desc[n].sn)
-            ;
-          else if (desc[n].snlen == -1)
-            {
-              unsigned char *sn;
-
-              s = desc[n].sn;
-              for (i=0; *s && *s != '/'; s++, i++)
-                ;
-              odd = (i & 1);
-              snlen = (i+1)/2;
-              sn_array[n].sn = xtrymalloc (snlen);
-              if (!sn_array[n].sn)
-                {
-                  hd->error = gpg_error (gpg_err_code_from_errno (errno));
-                  release_sn_array (sn_array, n);
-                  return hd->error;
-                }
-              sn_array[n].snlen = snlen;
-              sn = sn_array[n].sn;
-              s = desc[n].sn;
-              if (odd)
-                {
-                  *sn++ = xtoi_1 (s);
-                  s++;
-                }
-              for (; *s && *s != '/';  s += 2)
-                *sn++ = xtoi_2 (s);
-            }
-          else
-            {
-              const unsigned char *sn;
-
-              sn = desc[n].sn;
-              snlen = desc[n].snlen;
-              sn_array[n].sn = xtrymalloc (snlen);
-              if (!sn_array[n].sn)
-                {
-                  hd->error = gpg_error (gpg_err_code_from_errno (errno));
-                  release_sn_array (sn_array, n);
-                  return hd->error;
-                }
-              sn_array[n].snlen = snlen;
-              memcpy (sn_array[n].sn, sn, snlen);
-            }
-        }
-    }
-
-
-  for (;;)
-    {
-      unsigned int blobflags;
-
-      _keybox_release_blob (blob); blob = NULL;
-      rc = _keybox_read_blob (&blob, hd->fp);
-      if (rc)
-        break;
-
-      blobflags = blob_get_blob_flags (blob);
-      if (!hd->ephemeral && (blobflags & 2))
-        continue; /* not in ephemeral mode but blob is flagged ephemeral */
-
-      for (n=0; n < ndesc; n++) 
-        {
-          switch (desc[n].mode)
-            {
-            case KEYDB_SEARCH_MODE_NONE: 
-              never_reached ();
-              break;
-            case KEYDB_SEARCH_MODE_EXACT: 
-              if (has_subject_or_alt (blob, desc[n].u.name, 0))
-                goto found;
-              break;
-            case KEYDB_SEARCH_MODE_MAIL:
-              if (has_mail (blob, desc[n].u.name, 0))
-                goto found;
-              break;
-            case KEYDB_SEARCH_MODE_MAILSUB:
-              if (has_mail (blob, desc[n].u.name, 1))
-                goto found;
-              break;
-            case KEYDB_SEARCH_MODE_SUBSTR:
-              if (has_subject_or_alt (blob, desc[n].u.name, 1))
-                goto found;
-              break;
-            case KEYDB_SEARCH_MODE_MAILEND:
-            case KEYDB_SEARCH_MODE_WORDS: 
-              never_reached (); /* not yet implemented */
-              break;
-            case KEYDB_SEARCH_MODE_ISSUER:
-              if (has_issuer (blob, desc[n].u.name))
-                goto found;
-              break;
-            case KEYDB_SEARCH_MODE_ISSUER_SN:
-              if (has_issuer_sn (blob, desc[n].u.name,
-                                 sn_array? sn_array[n].sn : desc[n].sn,
-                                 sn_array? sn_array[n].snlen : desc[n].snlen))
-                goto found;
-              break;
-            case KEYDB_SEARCH_MODE_SN:
-              if (has_sn (blob, sn_array? sn_array[n].sn : desc[n].sn,
-                                sn_array? sn_array[n].snlen : desc[n].snlen))
-                goto found;
-              break;
-            case KEYDB_SEARCH_MODE_SUBJECT:
-              if (has_subject (blob, desc[n].u.name))
-                goto found;
-              break;
-            case KEYDB_SEARCH_MODE_SHORT_KID: 
-              if (has_short_kid (blob, desc[n].u.kid))
-                goto found;
-              break;
-            case KEYDB_SEARCH_MODE_LONG_KID:
-              if (has_long_kid (blob, desc[n].u.kid))
-                goto found;
-              break;
-            case KEYDB_SEARCH_MODE_FPR:
-            case KEYDB_SEARCH_MODE_FPR20:
-              if (has_fingerprint (blob, desc[n].u.fpr))
-                goto found;
-              break;
-            case KEYDB_SEARCH_MODE_FIRST: 
-              goto found;
-              break;
-            case KEYDB_SEARCH_MODE_NEXT: 
-              goto found;
-              break;
-            default: 
-              rc = gpg_error (GPG_ERR_INV_VALUE);
-              goto found;
-            }
-	}
-      continue;
-    found:  
-      for (n=any_skip?0:ndesc; n < ndesc; n++) 
-        {
-/*            if (desc[n].skipfnc */
-/*                && desc[n].skipfnc (desc[n].skipfncvalue, aki)) */
-/*              break; */
-        }
-      if (n == ndesc)
-        break; /* got it */
-    }
-  
-  if (!rc)
-    {
-      hd->found.blob = blob;
-    }
-  else if (rc == -1)
-    {
-      _keybox_release_blob (blob);
-      hd->eof = 1;
-    }
-  else 
-    {
-      _keybox_release_blob (blob);
-      hd->error = rc;
-    }
-
-  if (sn_array)
-    release_sn_array (sn_array, ndesc);
-
-  return rc;
-}
-
-
-
-
-/*
-   Functions to return a certificate or a keyblock.  To be used after
-   a successful search operation.
-*/
-#ifdef KEYBOX_WITH_X509
-/*
-  Return the last found cert.  Caller must free it.
- */
-int
-keybox_get_cert (KEYBOX_HANDLE hd, KsbaCert *r_cert)
-{
-  const unsigned char *buffer;
-  size_t length;
-  size_t cert_off, cert_len;
-  KsbaReader reader = NULL;
-  KsbaCert cert = NULL;
-  int rc;
-
-  if (!hd)
-    return gpg_error (GPG_ERR_INV_VALUE);
-  if (!hd->found.blob)
-    return gpg_error (GPG_ERR_NOTHING_FOUND);
-
-  if (blob_get_type (hd->found.blob) != BLOBTYPE_X509)
-    return gpg_error (GPG_ERR_WRONG_BLOB_TYPE);
-
-  buffer = _keybox_get_blob_image (hd->found.blob, &length);
-  if (length < 40)
-    return gpg_error (GPG_ERR_TOO_SHORT);
-  cert_off = get32 (buffer+8);
-  cert_len = get32 (buffer+12);
-  if (cert_off+cert_len > length)
-    return gpg_error (GPG_ERR_TOO_SHORT);
-
-  reader = ksba_reader_new ();
-  if (!reader)
-    return gpg_error (GPG_ERR_ENOMEM);
-  rc = ksba_reader_set_mem (reader, buffer+cert_off, cert_len);
-  if (rc)
-    {
-      ksba_reader_release (reader);
-      /* fixme: need to map the error codes */
-      return gpg_error (GPG_ERR_GENERAL);
-    }
-
-  cert = ksba_cert_new ();
-  if (!cert)
-    {
-      ksba_reader_release (reader);
-      return gpg_error (GPG_ERR_ENOMEM);
-    }
-
-  rc = ksba_cert_read_der (cert, reader);
-  if (rc)
-    {
-      ksba_cert_release (cert);
-      ksba_reader_release (reader);
-      /* fixme: need to map the error codes */
-      return gpg_error (GPG_ERR_GENERAL);
-    }
-
-  *r_cert = cert;
-  ksba_reader_release (reader);
-  return 0;
-}
-
-#endif /*KEYBOX_WITH_X509*/
diff --git a/kbx/keybox-update.c b/kbx/keybox-update.c
deleted file mode 100644
index 52ad258b0..000000000
--- a/kbx/keybox-update.c
+++ /dev/null
@@ -1,437 +0,0 @@
-/* keybox-update.c - keybox update operations
- *	Copyright (C) 2001, 2003 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-
-#include "keybox-defs.h"
-
-#define EXTSEP_S "."
-
-
-static int
-create_tmp_file (const char *template,
-                 char **r_bakfname, char **r_tmpfname, FILE **r_fp)
-{  
-  char *bakfname, *tmpfname;
-  
-  *r_bakfname = NULL;
-  *r_tmpfname = NULL;
-  
-# ifdef USE_ONLY_8DOT3
-  /* Here is another Windoze bug?:
-   * you cant rename("pubring.kbx.tmp", "pubring.kbx");
-   * but	rename("pubring.kbx.tmp", "pubring.aaa");
-   * works.  So we replace .kbx by .bak or .tmp
-   */
-  if (strlen (template) > 4
-      && !strcmp (template+strlen(template)-4, EXTSEP_S "kbx") )
-    {
-      bakfname = xtrymalloc (strlen (template) + 1);
-      if (!bakfname)
-        return gpg_error (gpg_err_code_from_errno (errno));
-      strcpy (bakfname, template);
-      strcpy (bakfname+strlen(template)-4, EXTSEP_S "bak");
-      
-      tmpfname = xtrymalloc (strlen (template) + 1);
-      if (!tmpfname)
-        {
-          gpg_error_t tmperr = gpg_error (gpg_err_code_from_errno (errno));
-          xfree (bakfname);
-          return tmperr;
-        }
-      strcpy (tmpfname,template);
-      strcpy (tmpfname + strlen (template)-4, EXTSEP_S "tmp");
-    }
-  else 
-    { /* file does not end with kbx; hmmm */
-      bakfname = xtrymalloc ( strlen (template) + 5);
-      if (!bakfname)
-        return gpg_error (gpg_err_code_from_errno (errno));
-      strcpy (stpcpy (bakfname, template), EXTSEP_S "bak");
-      
-      tmpfname = xtrymalloc ( strlen (template) + 5);
-      if (!tmpfname)
-        {
-          gpg_error_t tmperr = gpg_error (gpg_err_code_from_errno (errno));
-          xfree (bakfname);
-          return tmperr;
-        }
-      strcpy (stpcpy (tmpfname, template), EXTSEP_S "tmp");
-    }
-# else /* Posix file names */
-  bakfname = xtrymalloc (strlen (template) + 2);
-  if (!bakfname)
-    return gpg_error (gpg_err_code_from_errno (errno));
-  strcpy (stpcpy (bakfname,template),"~");
-  
-  tmpfname = xtrymalloc ( strlen (template) + 5);
-  if (!tmpfname)
-    {
-      gpg_error_t tmperr = gpg_error (gpg_err_code_from_errno (errno));
-      xfree (bakfname);
-      return tmperr;
-    }
-  strcpy (stpcpy (tmpfname,template), EXTSEP_S "tmp");
-# endif /* Posix filename */
-
-  *r_fp = fopen (tmpfname, "wb");
-  if (!*r_fp)
-    {
-      gpg_error_t tmperr = gpg_error (gpg_err_code_from_errno (errno));
-      xfree (tmpfname);
-      xfree (bakfname);
-      return tmperr;
-    }
-  
-  *r_bakfname = bakfname;
-  *r_tmpfname = tmpfname;
-  return 0;
-}
-
-
-static int
-rename_tmp_file (const char *bakfname, const char *tmpfname,
-                 const char *fname, int secret )
-{
-  int rc=0;
-
-  /* restrict the permissions for secret keyboxs */
-#ifndef HAVE_DOSISH_SYSTEM
-/*    if (secret && !opt.preserve_permissions) */
-/*      { */
-/*        if (chmod (tmpfname, S_IRUSR | S_IWUSR) )  */
-/*          { */
-/*            log_debug ("chmod of `%s' failed: %s\n", */
-/*                       tmpfname, strerror(errno) ); */
-/*            return KEYBOX_Write_File; */
-/*  	} */
-/*      } */
-#endif
-
-  /* fixme: invalidate close caches (not used with stdio)*/
-/*    iobuf_ioctl (NULL, 2, 0, (char*)tmpfname ); */
-/*    iobuf_ioctl (NULL, 2, 0, (char*)bakfname ); */
-/*    iobuf_ioctl (NULL, 2, 0, (char*)fname ); */
-
-  /* first make a backup file except for secret keyboxs */
-  if (!secret)
-    { 
-#if defined(HAVE_DOSISH_SYSTEM) || defined(__riscos__)
-      remove (bakfname);
-#endif
-      if (rename (fname, bakfname) )
-        {
-          return gpg_error (gpg_err_code_from_errno (errno));
-	}
-    }
-  
-  /* then rename the file */
-#if defined(HAVE_DOSISH_SYSTEM) || defined(__riscos__)
-  remove (fname);
-#endif
-  if (rename (tmpfname, fname) )
-    {
-      rc = gpg_error (gpg_err_code_from_errno (errno));
-      if (secret)
-        {
-/*            log_info ("WARNING: 2 files with confidential" */
-/*                       " information exists.\n"); */
-/*            log_info ("%s is the unchanged one\n", fname ); */
-/*            log_info ("%s is the new one\n", tmpfname ); */
-/*            log_info ("Please fix this possible security flaw\n"); */
-	}
-      return rc;
-    }
-  
-  return 0;
-}
-
-
-
-/* Perform insert/delete/update operation.
-    mode 1 = insert
- 	 2 = delete
- 	 3 = update
-*/
-static int
-blob_filecopy (int mode, const char *fname, KEYBOXBLOB blob, 
-               int secret, off_t start_offset, unsigned int n_packets )
-{
-  FILE *fp, *newfp;
-  int rc=0;
-  char *bakfname = NULL;
-  char *tmpfname = NULL;
-  char buffer[4096];
-  int nread, nbytes;
-
-  /* Open the source file. Because we do a rename, we have to check the 
-     permissions of the file */
-  if (access (fname, W_OK))
-    return gpg_error (gpg_err_code_from_errno (errno));
-
-  fp = fopen (fname, "rb");
-  if (mode == 1 && !fp && errno == ENOENT)
-    { /* insert mode but file does not exist: create a new keybox file */
-      newfp = fopen (fname, "wb");
-      if (!newfp )
-        {
-          return gpg_error (gpg_err_code_from_errno (errno));
-	}
-
-      rc = _keybox_write_blob (blob, newfp);
-      if (rc)
-        {
-          return rc;
-        }
-      if ( fclose (newfp) )
-        {
-          return gpg_error (gpg_err_code_from_errno (errno));
-	}
-
-/*        if (chmod( fname, S_IRUSR | S_IWUSR )) */
-/*          { */
-/*            log_debug ("%s: chmod failed: %s\n", fname, strerror(errno) ); */
-/*            return KEYBOX_File_Error; */
-/*          } */
-      return 0; /* ready */
-    }
-
-  if (!fp)
-    {
-      rc = gpg_error (gpg_err_code_from_errno (errno));
-      goto leave;
-    }
-
-  /* create the new file */
-  rc = create_tmp_file (fname, &bakfname, &tmpfname, &newfp);
-  if (rc)
-    {
-      fclose(fp);
-      goto leave;
-    }
-  
-  /* prepare for insert */
-  if (mode == 1)
-    { 
-      /* copy everything to the new file */
-      while ( (nread = fread (buffer, 1, DIM(buffer), fp)) > 0 )
-        {
-          if (fwrite (buffer, nread, 1, newfp) != 1)
-            {
-              rc = gpg_error (gpg_err_code_from_errno (errno));
-              goto leave;
-            }
-        }
-      if (ferror (fp))
-        {
-          rc = gpg_error (gpg_err_code_from_errno (errno));
-          goto leave;
-        }
-    }
-  
-  /* prepare for delete or update */
-  if ( mode == 2 || mode == 3 ) 
-    { 
-      off_t current = 0;
-      
-      /* copy first part to the new file */
-      while ( current < start_offset )
-        {
-          nbytes = DIM(buffer);
-          if (current + nbytes > start_offset)
-              nbytes = start_offset - current;
-          nread = fread (buffer, 1, nbytes, fp);
-          if (!fread)
-            break;
-          current += nread;
-          
-          if (fwrite (buffer, nread, 1, newfp) != 1)
-            {
-              rc = gpg_error (gpg_err_code_from_errno (errno));
-              goto leave;
-            }
-        }
-      if (ferror (fp))
-        {
-          rc = gpg_error (gpg_err_code_from_errno (errno));
-          goto leave;
-        }
-      
-      /* skip this blob */
-      rc = _keybox_read_blob (NULL, fp);
-      if (rc)
-        return rc;
-    }
-  
-  /* Do an insert or update */
-  if ( mode == 1 || mode == 3 )
-    { 
-      rc = _keybox_write_blob (blob, newfp);
-      if (rc)
-          return rc;
-    }
-  
-  /* copy the rest of the packet for an delete or update */
-  if (mode == 2 || mode == 3)
-    { 
-      while ( (nread = fread (buffer, 1, DIM(buffer), fp)) > 0 )
-        {
-          if (fwrite (buffer, nread, 1, newfp) != 1)
-            {
-              rc = gpg_error (gpg_err_code_from_errno (errno));
-              goto leave;
-            }
-        }
-      if (ferror (fp))
-        {
-          rc = gpg_error (gpg_err_code_from_errno (errno));
-          goto leave;
-        }
-    }
-    
-  /* close both files */
-  if (fclose(fp))
-    {
-      rc = gpg_error (gpg_err_code_from_errno (errno));
-      fclose (newfp);
-      goto leave;
-    }
-  if (fclose(newfp))
-    {
-      rc = gpg_error (gpg_err_code_from_errno (errno));
-      goto leave;
-    }
-
-  rc = rename_tmp_file (bakfname, tmpfname, fname, secret);
-
- leave:
-  xfree(bakfname);
-  xfree(tmpfname);
-  return rc;
-}
-
-
-
-
-#ifdef KEYBOX_WITH_X509 
-int
-keybox_insert_cert (KEYBOX_HANDLE hd, KsbaCert cert,
-                    unsigned char *sha1_digest)
-{
-  int rc;
-  const char *fname;
-  KEYBOXBLOB blob;
-
-  if (!hd)
-    return gpg_error (GPG_ERR_INV_HANDLE); 
-  if (!hd->kb)
-    return gpg_error (GPG_ERR_INV_HANDLE); 
-  fname = hd->kb->fname;
-  if (!fname)
-    return gpg_error (GPG_ERR_INV_HANDLE); 
-
-  /* close this one otherwise we will mess up the position for a next
-     search.  Fixme: it would be better to adjust the position after
-     the write opertions.  */
-  if (hd->fp)
-    {
-      fclose (hd->fp);
-      hd->fp = NULL;
-    }
-
-  rc = _keybox_create_x509_blob (&blob, cert, sha1_digest, hd->ephemeral);
-  if (!rc)
-    {
-      rc = blob_filecopy (1, fname, blob, hd->secret, 0, 0 );
-      _keybox_release_blob (blob);
-      /*    if (!rc && !hd->secret && kb_offtbl) */
-      /*      { */
-      /*        update_offset_hash_table_from_kb (kb_offtbl, kb, 0); */
-      /*      } */
-    }
-  return rc;
-}
-
-int
-keybox_update_cert (KEYBOX_HANDLE hd, KsbaCert cert,
-                    unsigned char *sha1_digest)
-{
-  return -1;
-}
-
-
-#endif /*KEYBOX_WITH_X509*/
-
-
-int
-keybox_delete (KEYBOX_HANDLE hd)
-{
-  off_t off;
-  const char *fname;
-  FILE *fp;
-  int rc;
-
-  if (!hd)
-    return gpg_error (GPG_ERR_INV_VALUE);
-  if (!hd->found.blob)
-    return gpg_error (GPG_ERR_NOTHING_FOUND);
-  if (!hd->kb)
-    return gpg_error (GPG_ERR_INV_HANDLE); 
-  fname = hd->kb->fname;
-  if (!fname)
-    return gpg_error (GPG_ERR_INV_HANDLE); 
-
-  off = _keybox_get_blob_fileoffset (hd->found.blob);
-  if (off == (off_t)-1)
-    return gpg_error (GPG_ERR_GENERAL);
-  off += 4;
-
-  if (hd->fp)
-    {
-      fclose (hd->fp);
-      hd->fp = NULL;
-    }
-  
-  fp = fopen (hd->kb->fname, "r+b");
-  if (!fp)
-    return gpg_error (gpg_err_code_from_errno (errno));
-
-  if (fseeko (fp, off, SEEK_SET))
-    rc = gpg_error (gpg_err_code_from_errno (errno));
-  else if (putc (0, fp) == EOF)
-    rc = gpg_error (gpg_err_code_from_errno (errno));
-  else
-    rc = 0;
-
-  if (fclose (fp))
-    {
-      if (!rc)
-        rc = gpg_error (gpg_err_code_from_errno (errno));
-    }
-
-  return rc;
-}
-
-
diff --git a/kbx/keybox-util.c b/kbx/keybox-util.c
deleted file mode 100644
index ed5d93de0..000000000
--- a/kbx/keybox-util.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* keybox-util.c - Utility functions for Keybox 
- *	Copyright (C) 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "keybox-defs.h"
-
-
-static void *(*alloc_func)(size_t n) = malloc;
-static void *(*realloc_func)(void *p, size_t n) = realloc;
-static void (*free_func)(void*) = free;
-
-
-
-void
-keybox_set_malloc_hooks ( void *(*new_alloc_func)(size_t n),
-                          void *(*new_realloc_func)(void *p, size_t n),
-                          void (*new_free_func)(void*) )
-{
-  alloc_func	    = new_alloc_func;
-  realloc_func      = new_realloc_func;
-  free_func	    = new_free_func;
-}
-
-void *
-_keybox_malloc (size_t n)
-{
-  return alloc_func (n);
-}
-
-void *
-_keybox_realloc (void *a, size_t n)
-{
-  return realloc_func (a, n);
-}
-
-void *
-_keybox_calloc (size_t n, size_t m)
-{
-  void *p = _keybox_malloc (n*m);
-  if (p)
-    memset (p, 0, n* m);
-  return p;
-}
-
-void
-_keybox_free (void *p)
-{
-  if (p)
-    free_func (p);
-}
-
diff --git a/kbx/keybox.h b/kbx/keybox.h
deleted file mode 100644
index 5fe5516d4..000000000
--- a/kbx/keybox.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* keybox.h - Keybox operations
- *	Copyright (C) 2001, 2003 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef KEYBOX_H
-#define KEYBOX_H 1
-#ifdef __cplusplus
-extern "C" { 
-#if 0
- }
-#endif
-#endif
-
-#include "keybox-search-desc.h"
-
-#define KEYBOX_WITH_OPENPGP 1 
-#define KEYBOX_WITH_X509 1
-
-
-#ifdef KEYBOX_WITH_OPENPGP
-#  undef KEYBOX_WITH_OPENPGP
-/*#include <lib-to-handle-gpg-data-structs.h>*/
-#endif
-
-#ifdef KEYBOX_WITH_X509
-# include <ksba.h>
-#endif
-
-
-
-typedef struct keybox_handle *KEYBOX_HANDLE;
-
-
-/*-- keybox-init.c --*/
-void *keybox_register_file (const char *fname, int secret);
-int keybox_is_writable (void *token);
-
-KEYBOX_HANDLE keybox_new (void *token, int secret);
-void keybox_release (KEYBOX_HANDLE hd);
-const char *keybox_get_resource_name (KEYBOX_HANDLE hd);
-int keybox_set_ephemeral (KEYBOX_HANDLE hd, int yes);
-
-
-/*-- keybox-search.c --*/
-#ifdef KEYBOX_WITH_X509 
-int keybox_get_cert (KEYBOX_HANDLE hd, KsbaCert *ret_cert);
-#endif /*KEYBOX_WITH_X509*/
-
-int keybox_search_reset (KEYBOX_HANDLE hd);
-int keybox_search (KEYBOX_HANDLE hd, KEYBOX_SEARCH_DESC *desc, size_t ndesc);
-
-
-/*-- keybox-update.c --*/
-#ifdef KEYBOX_WITH_X509 
-int keybox_insert_cert (KEYBOX_HANDLE hd, KsbaCert cert,
-                        unsigned char *sha1_digest);
-int keybox_update_cert (KEYBOX_HANDLE hd, KsbaCert cert,
-                        unsigned char *sha1_digest);
-#endif /*KEYBOX_WITH_X509*/
-
-int keybox_delete (KEYBOX_HANDLE hd);
-
-
-/*--  --*/
-
-#if 0
-int keybox_lock (KEYBOX_HANDLE hd, int yes);
-int keybox_get_keyblock (KEYBOX_HANDLE hd, KBNODE *ret_kb);
-int keybox_locate_writable (KEYBOX_HANDLE hd);
-int keybox_search_reset (KEYBOX_HANDLE hd);
-int keybox_search (KEYBOX_HANDLE hd, KEYDB_SEARCH_DESC *desc, size_t ndesc);
-int keybox_rebuild_cache (void *);
-#endif
-
-
-/*-- keybox-util.c --*/
-void keybox_set_malloc_hooks ( void *(*new_alloc_func)(size_t n),
-                               void *(*new_realloc_func)(void *p, size_t n),
-                               void (*new_free_func)(void*) );
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /*KEYBOX_H*/
diff --git a/kbx/mkerrors b/kbx/mkerrors
deleted file mode 100755
index 5adb7bfdf..000000000
--- a/kbx/mkerrors
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-# mkerrors - Extract error strings from assuan.h
-#            and create C source for assuan_strerror
-#	Copyright (C) 2001 Free Software Foundation, Inc.
-#
-# This file is part of GnuPG.
-#
-# GnuPG is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GnuPG is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-cat <<EOF
-/* Generated automatically by mkerrors */
-/* Do not edit! */
-
-#include <stdio.h>
-#include "keybox-defs.h"
-
-/**
- * keybox_strerror:
- * @err:  Error code 
- * 
- * This function returns a textual representaion of the given
- * errorcode. If this is an unknown value, a string with the value
- * is returned (Beware: it is hold in a static buffer).
- * 
- * Return value: String with the error description.
- **/
-const char *
-keybox_strerror (KeyboxError err)
-{
-  const char *s;
-  static char buf[25];
-
-  switch (err)
-    {
-EOF
-
-awk '
-/KEYBOX_No_Error/    { okay=1 }
-!okay              {next}
-/}/                { exit 0 }
-/KEYBOX_[A-Za-z_]*/ { print_code($1) }
-
-
-function print_code( s )
-{
-printf "    case %s: s=\"", s ;
-gsub(/_/, " ", s );
-printf "%s\"; break;\n", tolower(substr(s,8));
-}
-'
-
-cat <<EOF
-    default:  sprintf (buf, "ec=%d", err ); s=buf; break;
-    }
-
-  return s;
-}
-
-EOF
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index b28fe0d73..5fa09c4eb 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -4,7 +4,7 @@
 #
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
 # 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
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
diff --git a/keyserver/curl-shim.c b/keyserver/curl-shim.c
index bff0e4b59..3e058c239 100644
--- a/keyserver/curl-shim.c
+++ b/keyserver/curl-shim.c
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/keyserver/curl-shim.h b/keyserver/curl-shim.h
index 7b19b02f3..9865b6024 100644
--- a/keyserver/curl-shim.h
+++ b/keyserver/curl-shim.h
@@ -5,7 +5,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _CURL_SHIM_H_
diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c
index ca1a621c2..6adf6746c 100644
--- a/keyserver/gpgkeys_curl.c
+++ b/keyserver/gpgkeys_curl.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the Free Software Foundation
  * gives permission to link the code of the keyserver helper tools:
diff --git a/keyserver/gpgkeys_finger.c b/keyserver/gpgkeys_finger.c
index c91022c4e..f5aa3f587 100644
--- a/keyserver/gpgkeys_finger.c
+++ b/keyserver/gpgkeys_finger.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c
index 1a577a9af..ed9610de4 100644
--- a/keyserver/gpgkeys_hkp.c
+++ b/keyserver/gpgkeys_hkp.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the Free Software Foundation
  * gives permission to link the code of the keyserver helper tools:
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index 560513285..3c6ad81c6 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the Free Software Foundation
  * gives permission to link the code of the keyserver helper tools:
diff --git a/keyserver/gpgkeys_mailto.in b/keyserver/gpgkeys_mailto.in
index e37f5c0bc..fd422f430 100755
--- a/keyserver/gpgkeys_mailto.in
+++ b/keyserver/gpgkeys_mailto.in
@@ -7,7 +7,7 @@
 #
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
 # 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
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 use Getopt::Std;
 $Getopt::Std::STANDARD_HELP_VERSION=1;
 $sendmail="@SENDMAIL@ -t";
diff --git a/keyserver/gpgkeys_test.in b/keyserver/gpgkeys_test.in
index 97748cd3f..daf11988f 100755
--- a/keyserver/gpgkeys_test.in
+++ b/keyserver/gpgkeys_test.in
@@ -7,7 +7,7 @@
 #
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
 # 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
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 use Getopt::Std;
 $Getopt::Std::STANDARD_HELP_VERSION=1;
 
diff --git a/keyserver/ksutil.c b/keyserver/ksutil.c
index 8a439f995..b2efd00b8 100644
--- a/keyserver/ksutil.c
+++ b/keyserver/ksutil.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the Free Software Foundation
  * gives permission to link the code of the keyserver helper tools:
diff --git a/keyserver/ksutil.h b/keyserver/ksutil.h
index 3affc06b6..21a146758 100644
--- a/keyserver/ksutil.h
+++ b/keyserver/ksutil.h
@@ -5,7 +5,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the Free Software Foundation
  * gives permission to link the code of the keyserver helper tools:
diff --git a/m4/ChangeLog b/m4/ChangeLog
index e33b31c9d..95466dc8d 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,37 @@
+2007-10-23  gettextize  <[email protected]>
+
+	* gettext.m4: Upgrade to gettext-0.16.1.
+	* iconv.m4: Upgrade to gettext-0.16.1.
+	* lib-ld.m4: Upgrade to gettext-0.16.1.
+	* lib-link.m4: Upgrade to gettext-0.16.1.
+	* lib-prefix.m4: Upgrade to gettext-0.16.1.
+	* nls.m4: Upgrade to gettext-0.16.1.
+	* po.m4: Upgrade to gettext-0.16.1.
+	* progtest.m4: Upgrade to gettext-0.16.1.
+	* codeset.m4: Upgrade to gettext-0.16.1.
+	* glibc2.m4: New file, from gettext-0.16.1.
+	* glibc21.m4: Upgrade to gettext-0.16.1.
+	* intdiv0.m4: Upgrade to gettext-0.16.1.
+	* intl.m4: New file, from gettext-0.16.1.
+	* intldir.m4: New file, from gettext-0.16.1.
+	* intmax.m4: Upgrade to gettext-0.16.1.
+	* inttypes_h.m4: Upgrade to gettext-0.16.1.
+	* inttypes-pri.m4: Upgrade to gettext-0.16.1.
+	* lcmessage.m4: Upgrade to gettext-0.16.1.
+	* lock.m4: New file, from gettext-0.16.1.
+	* longdouble.m4: Upgrade to gettext-0.16.1.
+	* longlong.m4: Upgrade to gettext-0.16.1.
+	* printf-posix.m4: Upgrade to gettext-0.16.1.
+	* size_max.m4: Upgrade to gettext-0.16.1.
+	* stdint_h.m4: Upgrade to gettext-0.16.1.
+	* uintmax_t.m4: Upgrade to gettext-0.16.1.
+	* ulonglong.m4: Upgrade to gettext-0.16.1.
+	* visibility.m4: New file, from gettext-0.16.1.
+	* wchar_t.m4: Upgrade to gettext-0.16.1.
+	* wint_t.m4: Upgrade to gettext-0.16.1.
+	* xsize.m4: Upgrade to gettext-0.16.1.
+	* Makefile.am (EXTRA_DIST): Add the new files.
+
 2007-08-02  David Shaw  <[email protected]>
 
 	* ldap.m4: Revert the mozldap change: mozldap has some significant
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 93bed4a41..a7eb1f527 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 \
+EXTRA_DIST = glibc2.m4 intl.m4 intldir.m4 lock.m4 visibility.m4 intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 \
              signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4 \
              codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 \
              inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 \
diff --git a/m4/codeset.m4 b/m4/codeset.m4
index 59535ebcf..223955b45 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,10 +1,8 @@
-# codeset.m4 serial AM1 (gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# codeset.m4 serial 2 (gettext-0.16)
+dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
@@ -12,7 +10,7 @@ AC_DEFUN([AM_LANGINFO_CODESET],
 [
   AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
     [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
+      [char* cs = nl_langinfo(CODESET); return !cs;],
       am_cv_langinfo_codeset=yes,
       am_cv_langinfo_codeset=no)
     ])
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index a374f03fa..91c345e99 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,10 +1,8 @@
-# gettext.m4 serial 28 (gettext-0.13)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# gettext.m4 serial 59 (gettext-0.16.1)
+dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -17,7 +15,7 @@ dnl They are *not* in the public domain.
 
 dnl Authors:
 dnl   Ulrich Drepper <[email protected]>, 1995-2000.
-dnl   Bruno Haible <[email protected]>, 2000-2003.
+dnl   Bruno Haible <[email protected]>, 2000-2006.
 
 dnl Macro to add for using GNU gettext.
 
@@ -65,8 +63,13 @@ AC_DEFUN([AM_GNU_GETTEXT],
   ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
     [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
 ])])])])
-  define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
-  define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
+  define([gt_included_intl],
+    ifelse([$1], [external],
+      ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
+      [yes]))
+  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+  gt_NEEDS_INIT
+  AM_GNU_GETTEXT_NEED([$2])
 
   AC_REQUIRE([AM_PO_SUBDIRS])dnl
   ifelse(gt_included_intl, yes, [
@@ -80,7 +83,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
   dnl Sometimes libintl requires libiconv, so first search for libiconv.
   dnl Ideally we would do this search only after the
   dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
   dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
   dnl the configure script would need to contain the same shell code
   dnl again, outside any 'if'. There are two solutions:
@@ -92,8 +95,11 @@ AC_DEFUN([AM_GNU_GETTEXT],
     AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
   ])
 
+  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+  gt_INTL_MACOSX
+
   dnl Set USE_NLS.
-  AM_NLS
+  AC_REQUIRE([AM_NLS])
 
   ifelse(gt_included_intl, yes, [
     BUILD_INCLUDED_LIBINTL=no
@@ -103,6 +109,15 @@ AC_DEFUN([AM_GNU_GETTEXT],
   LTLIBINTL=
   POSUB=
 
+  dnl Add a version number to the cache macros.
+  case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
   dnl If we use NLS figure out what method
   if test "$USE_NLS" = "yes"; then
     gt_use_preinstalled_gnugettext=no
@@ -121,28 +136,35 @@ AC_DEFUN([AM_GNU_GETTEXT],
         dnl to use.  If GNU gettext is available we use this.  Else we have
         dnl to fall back to GNU NLS library.
 
-        dnl Add a version number to the cache macros.
-        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
-        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
-        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
-
-        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-         [AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
 #endif
 changequote(,)dnl
 typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
 changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
+'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
+
+        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
+         [AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;],
             [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
-            gt_cv_func_gnugettext_libc=yes,
-            gt_cv_func_gnugettext_libc=no)])
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
+            [eval "$gt_func_gnugettext_libc=yes"],
+            [eval "$gt_func_gnugettext_libc=no"])])
 
-        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
           dnl Sometimes libintl requires libiconv, so first search for libiconv.
           ifelse(gt_included_intl, yes, , [
             AM_ICONV_LINK
@@ -153,52 +175,40 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
           dnl even if libiconv doesn't exist.
           AC_LIB_LINKFLAGS_BODY([intl])
           AC_CACHE_CHECK([for GNU gettext in libintl],
-            gt_cv_func_gnugettext_libintl,
+            [$gt_func_gnugettext_libintl],
            [gt_save_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
             dnl Now see whether libintl exists and does not depend on libiconv.
             AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias ();],
+const char *_nl_expand_alias (const char *);],
               [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-              gt_cv_func_gnugettext_libintl=yes,
-              gt_cv_func_gnugettext_libintl=no)
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+              [eval "$gt_func_gnugettext_libintl=yes"],
+              [eval "$gt_func_gnugettext_libintl=no"])
             dnl Now see whether libintl exists and depends on libiconv.
-            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
               AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias ();],
+const char *_nl_expand_alias (const char *);],
                 [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
                [LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext_libintl=yes
+                eval "$gt_func_gnugettext_libintl=yes"
                ])
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
@@ -209,8 +219,8 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
         dnl use it.  But if this macro is used in GNU gettext, and GNU
         dnl gettext is already preinstalled in libintl, we update this
         dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if test "$gt_cv_func_gnugettext_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
                 && test "$PACKAGE" != gettext-runtime \
                 && test "$PACKAGE" != gettext-tools; }; then
           gt_use_preinstalled_gnugettext=yes
@@ -233,11 +243,12 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
         dnl Mark actions used to generate GNU NLS library.
         BUILD_INCLUDED_LIBINTL=yes
         USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
+        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
+        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
         LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 
+      CATOBJEXT=
       if test "$gt_use_preinstalled_gnugettext" = "yes" \
          || test "$nls_cv_use_gnu_gettext" = "yes"; then
         dnl Mark actions to use GNU gettext tools.
@@ -245,6 +256,15 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
       fi
     ])
 
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Some extra flags are needed during linking.
+        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
       AC_DEFINE(ENABLE_NLS, 1,
@@ -260,7 +280,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
   if test "$USE_NLS" = "yes"; then
     AC_MSG_CHECKING([where the gettext function comes from])
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
         gt_source="external libintl"
       else
         gt_source="libc"
@@ -274,7 +294,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
         AC_MSG_CHECKING([how to link with libintl])
         AC_MSG_RESULT([$LIBINTL])
         AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
@@ -320,6 +340,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
     AC_SUBST(GENCAT)
 
     dnl For backward compatibility. Some Makefiles may be using this.
+    INTLOBJS=
     if test "$USE_INCLUDED_LIBINTL" = yes; then
       INTLOBJS="\$(GETTOBJS)"
     fi
@@ -341,145 +362,56 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
 ])
 
 
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-AC_DEFUN([AM_INTL_SUBDIR],
+dnl Checks for special options needed on MacOS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
 [
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-  AC_REQUIRE([AC_PROG_RANLIB])dnl
-  AC_REQUIRE([AC_ISC_POSIX])dnl
-  AC_REQUIRE([AC_HEADER_STDC])dnl
-  AC_REQUIRE([AC_C_CONST])dnl
-  AC_REQUIRE([bh_C_SIGNED])dnl
-  AC_REQUIRE([AC_C_INLINE])dnl
-  AC_REQUIRE([AC_TYPE_OFF_T])dnl
-  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl
-  AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
-  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
-  AC_REQUIRE([gt_TYPE_WINT_T])dnl
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
-  AC_REQUIRE([gt_TYPE_INTMAX_T])
-  AC_REQUIRE([gt_PRINTF_POSIX])
-  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-  AC_REQUIRE([AC_FUNC_MMAP])dnl
-  AC_REQUIRE([jm_GLIBC21])dnl
-  AC_REQUIRE([gt_INTDIV0])dnl
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
-  AC_REQUIRE([gt_INTTYPES_PRI])dnl
-  AC_REQUIRE([gl_XSIZE])dnl
-
-  AC_CHECK_TYPE([ptrdiff_t], ,
-    [AC_DEFINE([ptrdiff_t], [long],
-       [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
-    ])
-  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h])
-  AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
-mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
-strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
-__fsetlocking])
-
-  dnl Use the _snprintf function only if it is declared (because on NetBSD it
-  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
-  gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
-  gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
-
-  dnl Use the *_unlocked functions only if they are declared.
-  dnl (because some of them were defined without being declared in Solaris
-  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
-  dnl on Solaris 2.5.1 to run on Solaris 2.6).
-  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
-  gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
-  gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
-  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
-
-  case $gt_cv_func_printf_posix in
-    *yes) HAVE_POSIX_PRINTF=1 ;;
-    *) HAVE_POSIX_PRINTF=0 ;;
-  esac
-  AC_SUBST([HAVE_POSIX_PRINTF])
-  if test "$ac_cv_func_asprintf" = yes; then
-    HAVE_ASPRINTF=1
-  else
-    HAVE_ASPRINTF=0
+  dnl Check for API introduced in MacOS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    gt_cv_func_CFPreferencesCopyAppValue,
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
+       [CFPreferencesCopyAppValue(NULL, NULL)],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
+      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
   fi
-  AC_SUBST([HAVE_ASPRINTF])
-  if test "$ac_cv_func_snprintf" = yes; then
-    HAVE_SNPRINTF=1
-  else
-    HAVE_SNPRINTF=0
+  dnl Check for API introduced in MacOS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
+       [gt_cv_func_CFLocaleCopyCurrent=yes],
+       [gt_cv_func_CFLocaleCopyCurrent=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
+      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
   fi
-  AC_SUBST([HAVE_SNPRINTF])
-  if test "$ac_cv_func_wprintf" = yes; then
-    HAVE_WPRINTF=1
-  else
-    HAVE_WPRINTF=0
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
   fi
-  AC_SUBST([HAVE_WPRINTF])
+  AC_SUBST([INTL_MACOSX_LIBS])
+])
 
-  AM_ICONV
-  AM_LANGINFO_CODESET
-  if test $ac_cv_header_locale_h = yes; then
-    AM_LC_MESSAGES
-  fi
 
-  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-  dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-  dnl compile.
-  dnl bison is only needed for the maintainer (who touches plural.y). But in
-  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-  dnl the rule in general Makefile. Now, some people carelessly touch the
-  dnl files or have a broken "make" program, hence the plural.c rule will
-  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-  dnl present or too old.
-  AC_CHECK_PROGS([INTLBISON], [bison])
-  if test -z "$INTLBISON"; then
-    ac_verc_fail=yes
-  else
-    dnl Found it, now check the version.
-    AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
-    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-    case $ac_prog_version in
-      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-changequote([,])dnl
-         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-    esac
-    AC_MSG_RESULT([$ac_prog_version])
-  fi
-  if test $ac_verc_fail = yes; then
-    INTLBISON=:
-  fi
+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
+m4_define([gt_NEEDS_INIT],
+[
+  m4_divert_text([DEFAULTS], [gt_needs=])
+  m4_define([gt_NEEDS_INIT], [])
 ])
 
 
-dnl gt_CHECK_DECL(FUNC, INCLUDES)
-dnl Check whether a function is declared.
-AC_DEFUN([gt_CHECK_DECL],
+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
+AC_DEFUN([AM_GNU_GETTEXT_NEED],
 [
-  AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
-    [AC_TRY_COMPILE([$2], [
-#ifndef $1
-  char *p = (char *) $1;
-#endif
-], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
-  if test $ac_cv_have_decl_$1 = yes; then
-    gt_value=1
-  else
-    gt_value=0
-  fi
-  AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
-    [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
+  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
 ])
 
 
diff --git a/m4/glibc2.m4 b/m4/glibc2.m4
new file mode 100644
index 000000000..e8f5bfe6e
--- /dev/null
+++ b/m4/glibc2.m4
@@ -0,0 +1,30 @@
+# glibc2.m4 serial 1
+dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Test for the GNU C Library, version 2.0 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([gt_GLIBC2],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer,
+      ac_cv_gnu_library_2,
+      [AC_EGREP_CPP([Lucky GNU user],
+	[
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ >= 2)
+  Lucky GNU user
+ #endif
+#endif
+	],
+	ac_cv_gnu_library_2=yes,
+	ac_cv_gnu_library_2=no)
+      ]
+    )
+    AC_SUBST(GLIBC2)
+    GLIBC2="$ac_cv_gnu_library_2"
+  ]
+)
diff --git a/m4/glibc21.m4 b/m4/glibc21.m4
index 9c9f3db30..d95fd9861 100644
--- a/m4/glibc21.m4
+++ b/m4/glibc21.m4
@@ -1,15 +1,13 @@
-# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# glibc21.m4 serial 3
+dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 # Test for the GNU C Library, version 2.1 or newer.
 # From Bruno Haible.
 
-AC_DEFUN([jm_GLIBC21],
+AC_DEFUN([gl_GLIBC21],
   [
     AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
       ac_cv_gnu_library_2_1,
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index c5f357982..654c41589 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,10 +1,8 @@
 # iconv.m4 serial AM4 (gettext-0.11.3)
 dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4
index 55dddcf1c..b8d78176a 100644
--- a/m4/intdiv0.m4
+++ b/m4/intdiv0.m4
@@ -1,10 +1,8 @@
 # intdiv0.m4 serial 1 (gettext-0.11.3)
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
diff --git a/m4/intl.m4 b/m4/intl.m4
new file mode 100644
index 000000000..dcefb118c
--- /dev/null
+++ b/m4/intl.m4
@@ -0,0 +1,259 @@
+# intl.m4 serial 3 (gettext-0.16)
+dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <[email protected]>, 1995-2000.
+dnl   Bruno Haible <[email protected]>, 2000-2006.
+
+AC_PREREQ(2.52)
+
+dnl Checks for all prerequisites of the intl subdirectory,
+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
+dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
+AC_DEFUN([AM_INTL_SUBDIR],
+[
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+  AC_REQUIRE([AC_PROG_CC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+  AC_REQUIRE([gt_GLIBC2])dnl
+  AC_REQUIRE([AC_PROG_RANLIB])dnl
+  AC_REQUIRE([gl_VISIBILITY])dnl
+  AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
+  AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
+  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
+  AC_REQUIRE([gt_TYPE_WINT_T])dnl
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gt_TYPE_INTMAX_T])
+  AC_REQUIRE([gt_PRINTF_POSIX])
+  AC_REQUIRE([gl_GLIBC21])dnl
+  AC_REQUIRE([gl_XSIZE])dnl
+  AC_REQUIRE([gt_INTL_MACOSX])dnl
+
+  AC_CHECK_TYPE([ptrdiff_t], ,
+    [AC_DEFINE([ptrdiff_t], [long],
+       [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
+    ])
+  AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
+  AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen])
+
+  dnl Use the _snprintf function only if it is declared (because on NetBSD it
+  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
+  gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
+  gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
+
+  dnl Use the *_unlocked functions only if they are declared.
+  dnl (because some of them were defined without being declared in Solaris
+  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+  dnl on Solaris 2.5.1 to run on Solaris 2.6).
+  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
+
+  case $gt_cv_func_printf_posix in
+    *yes) HAVE_POSIX_PRINTF=1 ;;
+    *) HAVE_POSIX_PRINTF=0 ;;
+  esac
+  AC_SUBST([HAVE_POSIX_PRINTF])
+  if test "$ac_cv_func_asprintf" = yes; then
+    HAVE_ASPRINTF=1
+  else
+    HAVE_ASPRINTF=0
+  fi
+  AC_SUBST([HAVE_ASPRINTF])
+  if test "$ac_cv_func_snprintf" = yes; then
+    HAVE_SNPRINTF=1
+  else
+    HAVE_SNPRINTF=0
+  fi
+  AC_SUBST([HAVE_SNPRINTF])
+  if test "$ac_cv_func_wprintf" = yes; then
+    HAVE_WPRINTF=1
+  else
+    HAVE_WPRINTF=0
+  fi
+  AC_SUBST([HAVE_WPRINTF])
+
+  AM_LANGINFO_CODESET
+  gt_LC_MESSAGES
+
+  dnl Compilation on mingw and Cygwin needs special Makefile rules, because
+  dnl 1. when we install a shared library, we must arrange to export
+  dnl    auxiliary pointer variables for every exported variable,
+  dnl 2. when we install a shared library and a static library simultaneously,
+  dnl    the include file specifies __declspec(dllimport) and therefore we
+  dnl    must arrange to define the auxiliary pointer variables for the
+  dnl    exported variables _also_ in the static library.
+  if test "$enable_shared" = yes; then
+    case "$host_os" in
+      cygwin*) is_woe32dll=yes ;;
+      *) is_woe32dll=no ;;
+    esac
+  else
+    is_woe32dll=no
+  fi
+  WOE32DLL=$is_woe32dll
+  AC_SUBST([WOE32DLL])
+
+  dnl Rename some macros and functions used for locking.
+  AH_BOTTOM([
+#define __libc_lock_t                   gl_lock_t
+#define __libc_lock_define              gl_lock_define
+#define __libc_lock_define_initialized  gl_lock_define_initialized
+#define __libc_lock_init                gl_lock_init
+#define __libc_lock_lock                gl_lock_lock
+#define __libc_lock_unlock              gl_lock_unlock
+#define __libc_lock_recursive_t                   gl_recursive_lock_t
+#define __libc_lock_define_recursive              gl_recursive_lock_define
+#define __libc_lock_define_initialized_recursive  gl_recursive_lock_define_initialized
+#define __libc_lock_init_recursive                gl_recursive_lock_init
+#define __libc_lock_lock_recursive                gl_recursive_lock_lock
+#define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
+#define glthread_in_use  libintl_thread_in_use
+#define glthread_lock_init     libintl_lock_init
+#define glthread_lock_lock     libintl_lock_lock
+#define glthread_lock_unlock   libintl_lock_unlock
+#define glthread_lock_destroy  libintl_lock_destroy
+#define glthread_rwlock_init     libintl_rwlock_init
+#define glthread_rwlock_rdlock   libintl_rwlock_rdlock
+#define glthread_rwlock_wrlock   libintl_rwlock_wrlock
+#define glthread_rwlock_unlock   libintl_rwlock_unlock
+#define glthread_rwlock_destroy  libintl_rwlock_destroy
+#define glthread_recursive_lock_init     libintl_recursive_lock_init
+#define glthread_recursive_lock_lock     libintl_recursive_lock_lock
+#define glthread_recursive_lock_unlock   libintl_recursive_lock_unlock
+#define glthread_recursive_lock_destroy  libintl_recursive_lock_destroy
+#define glthread_once                 libintl_once
+#define glthread_once_call            libintl_once_call
+#define glthread_once_singlethreaded  libintl_once_singlethreaded
+])
+])
+
+
+dnl Checks for the core files of the intl subdirectory:
+dnl   dcigettext.c
+dnl   eval-plural.h
+dnl   explodename.c
+dnl   finddomain.c
+dnl   gettextP.h
+dnl   gmo.h
+dnl   hash-string.h hash-string.c
+dnl   l10nflist.c
+dnl   libgnuintl.h.in (except the *printf stuff)
+dnl   loadinfo.h
+dnl   loadmsgcat.c
+dnl   localealias.c
+dnl   log.c
+dnl   plural-exp.h plural-exp.c
+dnl   plural.y
+dnl Used by libglocale.
+AC_DEFUN([gt_INTL_SUBDIR_CORE],
+[
+  AC_REQUIRE([AC_C_INLINE])dnl
+  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+  AC_REQUIRE([AC_FUNC_MMAP])dnl
+  AC_REQUIRE([gt_INTDIV0])dnl
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
+  AC_REQUIRE([gt_INTTYPES_PRI])dnl
+  AC_REQUIRE([gl_LOCK])dnl
+
+  AC_TRY_LINK(
+    [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }],
+    [],
+    [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1,
+       [Define to 1 if the compiler understands __builtin_expect.])])
+
+  AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h])
+  AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
+    stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \
+    argz_next __fsetlocking])
+
+  dnl Use the *_unlocked functions only if they are declared.
+  dnl (because some of them were defined without being declared in Solaris
+  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+  dnl on Solaris 2.5.1 to run on Solaris 2.6).
+  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+  gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
+  gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
+
+  AM_ICONV
+
+  dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined,
+  dnl and a _NL_LOCALE_NAME macro always.
+  AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name,
+    [AC_TRY_LINK([#include <langinfo.h>
+#include <locale.h>],
+      [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));],
+      gt_cv_nl_locale_name=yes,
+      gt_cv_nl_locale_name=no)
+    ])
+  if test $gt_cv_nl_locale_name = yes; then
+    AC_DEFINE(HAVE_NL_LOCALE_NAME, 1,
+      [Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.])
+  fi
+
+  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+  dnl because plural.y uses bison specific features. It requires at least
+  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+  dnl compile.
+  dnl bison is only needed for the maintainer (who touches plural.y). But in
+  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+  dnl the rule in general Makefile. Now, some people carelessly touch the
+  dnl files or have a broken "make" program, hence the plural.c rule will
+  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+  dnl present or too old.
+  AC_CHECK_PROGS([INTLBISON], [bison])
+  if test -z "$INTLBISON"; then
+    ac_verc_fail=yes
+  else
+    dnl Found it, now check the version.
+    AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+    case $ac_prog_version in
+      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+    esac
+    AC_MSG_RESULT([$ac_prog_version])
+  fi
+  if test $ac_verc_fail = yes; then
+    INTLBISON=:
+  fi
+])
+
+
+dnl gt_CHECK_DECL(FUNC, INCLUDES)
+dnl Check whether a function is declared.
+AC_DEFUN([gt_CHECK_DECL],
+[
+  AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
+    [AC_TRY_COMPILE([$2], [
+#ifndef $1
+  char *p = (char *) $1;
+#endif
+], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
+  if test $ac_cv_have_decl_$1 = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
+  AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
+    [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
+])
diff --git a/m4/intldir.m4 b/m4/intldir.m4
new file mode 100644
index 000000000..7a28843f6
--- /dev/null
+++ b/m4/intldir.m4
@@ -0,0 +1,19 @@
+# intldir.m4 serial 1 (gettext-0.16)
+dnl Copyright (C) 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+AC_PREREQ(2.52)
+
+dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory.
+AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], [])
diff --git a/m4/intmax.m4 b/m4/intmax.m4
index dfb08ccc9..ce7a8a49d 100644
--- a/m4/intmax.m4
+++ b/m4/intmax.m4
@@ -1,10 +1,8 @@
-# intmax.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# intmax.m4 serial 3 (gettext-0.16)
+dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 dnl Test whether the system has the 'intmax_t' type, but don't attempt to
@@ -12,11 +10,11 @@ dnl find a replacement if it is lacking.
 
 AC_DEFUN([gt_TYPE_INTMAX_T],
 [
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
   AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
     [AC_TRY_COMPILE([
-#include <stddef.h> 
+#include <stddef.h>
 #include <stdlib.h>
 #if HAVE_STDINT_H_WITH_UINTMAX
 #include <stdint.h>
@@ -24,7 +22,10 @@ AC_DEFUN([gt_TYPE_INTMAX_T],
 #if HAVE_INTTYPES_H_WITH_UINTMAX
 #include <inttypes.h>
 #endif
-], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
+],     [intmax_t x = -1;
+        return !x;],
+       gt_cv_c_intmax_t=yes,
+       gt_cv_c_intmax_t=no)])
   if test $gt_cv_c_intmax_t = yes; then
     AC_DEFINE(HAVE_INTMAX_T, 1,
       [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
index fd007c312..7c7f89401 100644
--- a/m4/inttypes-pri.m4
+++ b/m4/inttypes-pri.m4
@@ -1,20 +1,20 @@
-# inttypes-pri.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# inttypes-pri.m4 serial 4 (gettext-0.16)
+dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
+AC_PREREQ(2.52)
+
 # Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
 # macros to non-string values.  This is the case on AIX 4.3.3.
 
 AC_DEFUN([gt_INTTYPES_PRI],
 [
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])
-  if test $gt_cv_header_inttypes_h = yes; then
+  AC_CHECK_HEADERS([inttypes.h])
+  if test $ac_cv_header_inttypes_h = yes; then
     AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
       gt_cv_inttypes_pri_broken,
       [
@@ -28,5 +28,9 @@ char *p = PRId32;
   if test "$gt_cv_inttypes_pri_broken" = yes; then
     AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
       [Define if <inttypes.h> exists and defines unusable PRI* macros.])
+    PRI_MACROS_BROKEN=1
+  else
+    PRI_MACROS_BROKEN=0
   fi
+  AC_SUBST([PRI_MACROS_BROKEN])
 ])
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index f342eba39..edc8ecb2d 100644
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -1,26 +1,24 @@
-# inttypes_h.m4 serial 5 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# inttypes_h.m4 serial 7
+dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Paul Eggert.
 
 # Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
 # doesn't clash with <sys/types.h>, and declares uintmax_t.
 
-AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
+AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
 [
-  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
+  AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
   [AC_TRY_COMPILE(
     [#include <sys/types.h>
 #include <inttypes.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    jm_ac_cv_header_inttypes_h=yes,
-    jm_ac_cv_header_inttypes_h=no)])
-  if test $jm_ac_cv_header_inttypes_h = yes; then
+    [uintmax_t i = (uintmax_t) -1; return !i;],
+    gl_cv_header_inttypes_h=yes,
+    gl_cv_header_inttypes_h=no)])
+  if test $gl_cv_header_inttypes_h = yes; then
     AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
       [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
        and declares uintmax_t. ])
diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4
index ffd4008b8..19aa77e4f 100644
--- a/m4/lcmessage.m4
+++ b/m4/lcmessage.m4
@@ -1,10 +1,8 @@
-# lcmessage.m4 serial 3 (gettext-0.11.3)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lcmessage.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -20,12 +18,12 @@ dnl   Ulrich Drepper <[email protected]>, 1995.
 
 # Check whether LC_MESSAGES is available in <locale.h>.
 
-AC_DEFUN([AM_LC_MESSAGES],
+AC_DEFUN([gt_LC_MESSAGES],
 [
-  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+  AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES,
     [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-  if test $am_cv_val_LC_MESSAGES = yes; then
+       gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)])
+  if test $gt_cv_val_LC_MESSAGES = yes; then
     AC_DEFINE(HAVE_LC_MESSAGES, 1,
       [Define if your <locale.h> file defines LC_MESSAGES.])
   fi
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
index 38aeaec19..96c4e2c33 100644
--- a/m4/lib-ld.m4
+++ b/m4/lib-ld.m4
@@ -1,10 +1,8 @@
 # lib-ld.m4 serial 3 (gettext-0.13)
 dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl Subroutines of libtool.m4,
 dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index eeb200d26..f95b7ba88 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,13 +1,13 @@
-# lib-link.m4 serial 4 (gettext-0.12)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lib-link.m4 serial 9 (gettext-0.16)
+dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
+AC_PREREQ(2.50)
+
 dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
 dnl the libraries corresponding to explicit and implicit dependencies.
 dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
@@ -95,6 +95,8 @@ dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
 dnl hardcode_direct, hardcode_minus_L.
 AC_DEFUN([AC_LIB_RPATH],
 [
+  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
   AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
   AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
   AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
@@ -124,6 +126,7 @@ dnl the libraries corresponding to explicit and implicit dependencies.
 dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
 [
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
   dnl By default, look in $includedir and $libdir.
@@ -146,7 +149,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
         ])
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+        additional_libdir="$withval/$acl_libdirstem"
       fi
     fi
 ])
@@ -195,9 +198,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
           found_so=
           found_a=
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
               found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
+              else
+                found_so="$additional_libdir/lib$name.dll.a"
+              fi
               if test -f "$additional_libdir/lib$name.la"; then
                 found_la="$additional_libdir/lib$name.la"
               fi
@@ -217,9 +227,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
                     found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
+                    else
+                      found_so="$dir/lib$name.dll.a"
+                    fi
                     if test -f "$dir/lib$name.la"; then
                       found_la="$dir/lib$name.la"
                     fi
@@ -246,7 +263,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               dnl Linking with a shared library. We attempt to hardcode its
               dnl directory into the executable's runpath, unless it's the
               dnl standard /usr/lib.
-              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
                 dnl No hardcoding is needed.
                 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
               else
@@ -332,8 +349,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
             dnl Assume the include files are nearby.
             additional_includedir=
             case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -350,7 +367,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                 if test "X$additional_includedir" = "X/usr/local/include"; then
                   if test -n "$GCC"; then
                     case $host_os in
-                      linux*) haveit=yes;;
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                     esac
                   fi
                 fi
@@ -394,12 +411,12 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                     dnl   3. if it's already present in $LDFLAGS or the already
                     dnl      constructed $LIBNAME,
                     dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/lib"; then
+                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
                         if test -n "$GCC"; then
                           case $host_os in
-                            linux*) haveit=yes;;
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                           esac
                         fi
                       fi
@@ -549,3 +566,79 @@ AC_DEFUN([AC_LIB_APPENDTOVAR],
     fi
   done
 ])
+
+dnl For those cases where a variable contains several -L and -l options
+dnl referring to unknown libraries and directories, this macro determines the
+dnl necessary additional linker options for the runtime path.
+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
+dnl otherwise linking without libtool is assumed.
+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+[
+  AC_REQUIRE([AC_LIB_RPATH])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  $1=
+  if test "$enable_rpath" != no; then
+    if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+      dnl Use an explicit option to hardcode directories into the resulting
+      dnl binary.
+      rpathdirs=
+      next=
+      for opt in $2; do
+        if test -n "$next"; then
+          dir="$next"
+          dnl No need to hardcode the standard /usr/lib.
+          if test "X$dir" != "X/usr/$acl_libdirstem"; then
+            rpathdirs="$rpathdirs $dir"
+          fi
+          next=
+        else
+          case $opt in
+            -L) next=yes ;;
+            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+                 dnl No need to hardcode the standard /usr/lib.
+                 if test "X$dir" != "X/usr/$acl_libdirstem"; then
+                   rpathdirs="$rpathdirs $dir"
+                 fi
+                 next= ;;
+            *) next= ;;
+          esac
+        fi
+      done
+      if test "X$rpathdirs" != "X"; then
+        if test -n ""$3""; then
+          dnl libtool is used for linking. Use -R options.
+          for dir in $rpathdirs; do
+            $1="${$1}${$1:+ }-R$dir"
+          done
+        else
+          dnl The linker is used for linking directly.
+          if test -n "$hardcode_libdir_separator"; then
+            dnl Weird platform: only the last -rpath option counts, the user
+            dnl must pass all path elements in one option.
+            alldirs=
+            for dir in $rpathdirs; do
+              alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir"
+            done
+            acl_save_libdir="$libdir"
+            libdir="$alldirs"
+            eval flag=\"$hardcode_libdir_flag_spec\"
+            libdir="$acl_save_libdir"
+            $1="$flag"
+          else
+            dnl The -rpath options are cumulative.
+            for dir in $rpathdirs; do
+              acl_save_libdir="$libdir"
+              libdir="$dir"
+              eval flag=\"$hardcode_libdir_flag_spec\"
+              libdir="$acl_save_libdir"
+              $1="${$1}${$1:+ }$flag"
+            done
+          fi
+        fi
+      fi
+    fi
+  fi
+  AC_SUBST([$1])
+])
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 8aff5a9d2..a8684e17e 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,10 +1,8 @@
-# lib-prefix.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lib-prefix.m4 serial 5 (gettext-0.15)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
@@ -26,6 +24,7 @@ AC_DEFUN([AC_LIB_PREFIX],
   AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   dnl By default, look in $includedir and $libdir.
   use_additional=yes
@@ -47,7 +46,7 @@ AC_DEFUN([AC_LIB_PREFIX],
         ])
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+        additional_libdir="$withval/$acl_libdirstem"
       fi
     fi
 ])
@@ -71,7 +70,7 @@ AC_DEFUN([AC_LIB_PREFIX],
         if test "X$additional_includedir" = "X/usr/local/include"; then
           if test -n "$GCC"; then
             case $host_os in
-              linux*) haveit=yes;;
+              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
             esac
           fi
         fi
@@ -89,7 +88,7 @@ AC_DEFUN([AC_LIB_PREFIX],
     dnl   2. if it's already present in $LDFLAGS,
     dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
     dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/lib"; then
+    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
       haveit=
       for x in $LDFLAGS; do
         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
@@ -99,7 +98,7 @@ AC_DEFUN([AC_LIB_PREFIX],
         fi
       done
       if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/lib"; then
+        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
           if test -n "$GCC"; then
             case $host_os in
               linux*) haveit=yes;;
@@ -153,3 +152,34 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 ])
+
+dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
+dnl the basename of the libdir, either "lib" or "lib64".
+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+[
+  dnl There is no formal standard regarding lib and lib64. The current
+  dnl practice is that on a system supporting 32-bit and 64-bit instruction
+  dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
+  dnl libraries go under $prefix/lib. We determine the compiler's default
+  dnl mode by looking at the compiler's library search path. If at least
+  dnl of its elements ends in /lib64 or points to a directory whose absolute
+  dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
+  dnl default, namely "lib".
+  acl_libdirstem=lib
+  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+  if test -n "$searchpath"; then
+    acl_save_IFS="${IFS= 	}"; IFS=":"
+    for searchdir in $searchpath; do
+      if test -d "$searchdir"; then
+        case "$searchdir" in
+          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+          *) searchdir=`cd "$searchdir" && pwd`
+             case "$searchdir" in
+               */lib64 ) acl_libdirstem=lib64 ;;
+             esac ;;
+        esac
+      fi
+    done
+    IFS="$acl_save_IFS"
+  fi
+])
diff --git a/m4/lock.m4 b/m4/lock.m4
new file mode 100644
index 000000000..0224f2ff8
--- /dev/null
+++ b/m4/lock.m4
@@ -0,0 +1,311 @@
+# lock.m4 serial 6 (gettext-0.16)
+dnl Copyright (C) 2005-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl Tests for a multithreading library to be used.
+dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS,
+dnl USE_PTH_THREADS, USE_WIN32_THREADS
+dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use
+dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with
+dnl libtool).
+dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for
+dnl programs that really need multithread functionality. The difference
+dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak
+dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread".
+dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
+dnl multithread-safe programs.
+
+AC_DEFUN([gl_LOCK_EARLY],
+[
+  AC_REQUIRE([gl_LOCK_EARLY_BODY])
+])
+
+dnl The guts of gl_LOCK_EARLY. Needs to be expanded only once.
+
+AC_DEFUN([gl_LOCK_EARLY_BODY],
+[
+  dnl Ordering constraints: This macro modifies CPPFLAGS in a way that
+  dnl influences the result of the autoconf tests that test for *_unlocked
+  dnl declarations, on AIX 5 at least. Therefore it must come early.
+  AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl
+  AC_BEFORE([$0], [gl_ARGP])dnl
+
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_GNU_SOURCE]) dnl needed for pthread_rwlock_t on glibc systems
+  dnl Check for multithreading.
+  AC_ARG_ENABLE(threads,
+AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API])
+AC_HELP_STRING([--disable-threads], [build without multithread safety]),
+    [gl_use_threads=$enableval],
+    [case "$host_os" in
+       dnl Disable multithreading by default on OSF/1, because it interferes
+       dnl with fork()/exec(): When msgexec is linked with -lpthread, its child
+       dnl process gets an endless segmentation fault inside execvp().
+       osf*) gl_use_threads=no ;;
+       *)    gl_use_threads=yes ;;
+     esac
+    ])
+  if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
+    # For using <pthread.h>:
+    case "$host_os" in
+      osf*)
+        # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
+        # groks <pthread.h>. cc also understands the flag -pthread, but
+        # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
+        # 2. putting a flag into CPPFLAGS that has an effect on the linker
+        # causes the AC_TRY_LINK test below to succeed unexpectedly,
+        # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
+        CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+        ;;
+    esac
+    # Some systems optimize for single-threaded programs by default, and
+    # need special flags to disable these optimizations. For example, the
+    # definition of 'errno' in <errno.h>.
+    case "$host_os" in
+      aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
+      solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
+    esac
+  fi
+])
+
+dnl The guts of gl_LOCK. Needs to be expanded only once.
+
+AC_DEFUN([gl_LOCK_BODY],
+[
+  AC_REQUIRE([gl_LOCK_EARLY_BODY])
+  gl_threads_api=none
+  LIBTHREAD=
+  LTLIBTHREAD=
+  LIBMULTITHREAD=
+  LTLIBMULTITHREAD=
+  if test "$gl_use_threads" != no; then
+    dnl Check whether the compiler and linker support weak declarations.
+    AC_MSG_CHECKING([whether imported symbols can be declared weak])
+    gl_have_weak=no
+    AC_TRY_LINK([extern void xyzzy ();
+#pragma weak xyzzy], [xyzzy();], [gl_have_weak=yes])
+    AC_MSG_RESULT([$gl_have_weak])
+    if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
+      # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
+      # it groks <pthread.h>. It's added above, in gl_LOCK_EARLY_BODY.
+      AC_CHECK_HEADER(pthread.h, gl_have_pthread_h=yes, gl_have_pthread_h=no)
+      if test "$gl_have_pthread_h" = yes; then
+        # Other possible tests:
+        #   -lpthreads (FSU threads, PCthreads)
+        #   -lgthreads
+        gl_have_pthread=
+        # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
+        # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
+        # the second one only in libpthread, and lock.c needs it.
+        AC_TRY_LINK([#include <pthread.h>],
+          [pthread_mutex_lock((pthread_mutex_t*)0);
+           pthread_mutexattr_init((pthread_mutexattr_t*)0);],
+          [gl_have_pthread=yes])
+        # Test for libpthread by looking for pthread_kill. (Not pthread_self,
+        # since it is defined as a macro on OSF/1.)
+        if test -n "$gl_have_pthread"; then
+          # The program links fine without libpthread. But it may actually
+          # need to link with libpthread in order to create multiple threads.
+          AC_CHECK_LIB(pthread, pthread_kill,
+            [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
+             # On Solaris and HP-UX, most pthread functions exist also in libc.
+             # Therefore pthread_in_use() needs to actually try to create a
+             # thread: pthread_create from libc will fail, whereas
+             # pthread_create will actually create a thread.
+             case "$host_os" in
+               solaris* | hpux*)
+                 AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], 1,
+                   [Define if the pthread_in_use() detection is hard.])
+             esac
+            ])
+        else
+          # Some library is needed. Try libpthread and libc_r.
+          AC_CHECK_LIB(pthread, pthread_kill,
+            [gl_have_pthread=yes
+             LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
+             LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread])
+          if test -z "$gl_have_pthread"; then
+            # For FreeBSD 4.
+            AC_CHECK_LIB(c_r, pthread_kill,
+              [gl_have_pthread=yes
+               LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
+               LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r])
+          fi
+        fi
+        if test -n "$gl_have_pthread"; then
+          gl_threads_api=posix
+          AC_DEFINE([USE_POSIX_THREADS], 1,
+            [Define if the POSIX multithreading library can be used.])
+          if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
+            if test $gl_have_weak = yes; then
+              AC_DEFINE([USE_POSIX_THREADS_WEAK], 1,
+                [Define if references to the POSIX multithreading library should be made weak.])
+              LIBTHREAD=
+              LTLIBTHREAD=
+            fi
+          fi
+          # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
+          # pthread_rwlock_* functions.
+          AC_CHECK_TYPE([pthread_rwlock_t],
+            [AC_DEFINE([HAVE_PTHREAD_RWLOCK], 1,
+               [Define if the POSIX multithreading library has read/write locks.])],
+            [],
+            [#include <pthread.h>])
+          # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
+          AC_TRY_COMPILE([#include <pthread.h>],
+            [#if __FreeBSD__ == 4
+error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
+#else
+int x = (int)PTHREAD_MUTEX_RECURSIVE;
+return !x;
+#endif],
+            [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], 1,
+               [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])])
+        fi
+      fi
+    fi
+    if test -z "$gl_have_pthread"; then
+      if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
+        gl_have_solaristhread=
+        gl_save_LIBS="$LIBS"
+        LIBS="$LIBS -lthread"
+        AC_TRY_LINK([#include <thread.h>
+#include <synch.h>],
+          [thr_self();],
+          [gl_have_solaristhread=yes])
+        LIBS="$gl_save_LIBS"
+        if test -n "$gl_have_solaristhread"; then
+          gl_threads_api=solaris
+          LIBTHREAD=-lthread
+          LTLIBTHREAD=-lthread
+          LIBMULTITHREAD="$LIBTHREAD"
+          LTLIBMULTITHREAD="$LTLIBTHREAD"
+          AC_DEFINE([USE_SOLARIS_THREADS], 1,
+            [Define if the old Solaris multithreading library can be used.])
+          if test $gl_have_weak = yes; then
+            AC_DEFINE([USE_SOLARIS_THREADS_WEAK], 1,
+              [Define if references to the old Solaris multithreading library should be made weak.])
+            LIBTHREAD=
+            LTLIBTHREAD=
+          fi
+        fi
+      fi
+    fi
+    if test "$gl_use_threads" = pth; then
+      gl_save_CPPFLAGS="$CPPFLAGS"
+      AC_LIB_LINKFLAGS(pth)
+      gl_have_pth=
+      gl_save_LIBS="$LIBS"
+      LIBS="$LIBS -lpth"
+      AC_TRY_LINK([#include <pth.h>], [pth_self();], gl_have_pth=yes)
+      LIBS="$gl_save_LIBS"
+      if test -n "$gl_have_pth"; then
+        gl_threads_api=pth
+        LIBTHREAD="$LIBPTH"
+        LTLIBTHREAD="$LTLIBPTH"
+        LIBMULTITHREAD="$LIBTHREAD"
+        LTLIBMULTITHREAD="$LTLIBTHREAD"
+        AC_DEFINE([USE_PTH_THREADS], 1,
+          [Define if the GNU Pth multithreading library can be used.])
+        if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
+          if test $gl_have_weak = yes; then
+            AC_DEFINE([USE_PTH_THREADS_WEAK], 1,
+              [Define if references to the GNU Pth multithreading library should be made weak.])
+            LIBTHREAD=
+            LTLIBTHREAD=
+          fi
+        fi
+      else
+        CPPFLAGS="$gl_save_CPPFLAGS"
+      fi
+    fi
+    if test -z "$gl_have_pthread"; then
+      if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then
+        if { case "$host_os" in
+               mingw*) true;;
+               *) false;;
+             esac
+           }; then
+          gl_threads_api=win32
+          AC_DEFINE([USE_WIN32_THREADS], 1,
+            [Define if the Win32 multithreading API can be used.])
+        fi
+      fi
+    fi
+  fi
+  AC_MSG_CHECKING([for multithread API to use])
+  AC_MSG_RESULT([$gl_threads_api])
+  AC_SUBST(LIBTHREAD)
+  AC_SUBST(LTLIBTHREAD)
+  AC_SUBST(LIBMULTITHREAD)
+  AC_SUBST(LTLIBMULTITHREAD)
+])
+
+AC_DEFUN([gl_LOCK],
+[
+  AC_REQUIRE([gl_LOCK_EARLY])
+  AC_REQUIRE([gl_LOCK_BODY])
+  gl_PREREQ_LOCK
+])
+
+# Prerequisites of lib/lock.c.
+AC_DEFUN([gl_PREREQ_LOCK], [
+  AC_REQUIRE([AC_C_INLINE])
+])
+
+dnl Survey of platforms:
+dnl
+dnl Platform          Available   Compiler    Supports   test-lock
+dnl                   flavours    option      weak       result
+dnl ---------------   ---------   ---------   --------   ---------
+dnl Linux 2.4/glibc   posix       -lpthread       Y      OK
+dnl
+dnl GNU Hurd/glibc    posix
+dnl
+dnl FreeBSD 5.3       posix       -lc_r           Y
+dnl                   posix       -lkse ?         Y
+dnl                   posix       -lpthread ?     Y
+dnl                   posix       -lthr           Y
+dnl
+dnl FreeBSD 5.2       posix       -lc_r           Y
+dnl                   posix       -lkse           Y
+dnl                   posix       -lthr           Y
+dnl
+dnl FreeBSD 4.0,4.10  posix       -lc_r           Y      OK
+dnl
+dnl NetBSD 1.6        --
+dnl
+dnl OpenBSD 3.4       posix       -lpthread       Y      OK
+dnl
+dnl MacOS X 10.[123]  posix       -lpthread       Y      OK
+dnl
+dnl Solaris 7,8,9     posix       -lpthread       Y      Sol 7,8: 0.0; Sol 9: OK
+dnl                   solaris     -lthread        Y      Sol 7,8: 0.0; Sol 9: OK
+dnl
+dnl HP-UX 11          posix       -lpthread       N (cc) OK
+dnl                                               Y (gcc)
+dnl
+dnl IRIX 6.5          posix       -lpthread       Y      0.5
+dnl
+dnl AIX 4.3,5.1       posix       -lpthread       N      AIX 4: 0.5; AIX 5: OK
+dnl
+dnl OSF/1 4.0,5.1     posix       -pthread (cc)   N      OK
+dnl                               -lpthread (gcc) Y
+dnl
+dnl Cygwin            posix       -lpthread       Y      OK
+dnl
+dnl Any of the above  pth         -lpth                  0.0
+dnl
+dnl Mingw             win32                       N      OK
+dnl
+dnl BeOS 5            --
+dnl
+dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is
+dnl turned off:
+dnl   OK if all three tests terminate OK,
+dnl   0.5 if the first test terminates OK but the second one loops endlessly,
+dnl   0.0 if the first test already loops endlessly.
diff --git a/m4/longdouble.m4 b/m4/longdouble.m4
index 1333d2f57..25590f470 100644
--- a/m4/longdouble.m4
+++ b/m4/longdouble.m4
@@ -1,15 +1,16 @@
-# longdouble.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# longdouble.m4 serial 2 (gettext-0.15)
+dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 dnl Test whether the compiler supports the 'long double' type.
 dnl Prerequisite: AC_PROG_CC
 
+dnl This file is only needed in autoconf <= 2.59.  Newer versions of autoconf
+dnl have a macro AC_TYPE_LONG_DOUBLE with identical semantics.
+
 AC_DEFUN([gt_TYPE_LONGDOUBLE],
 [
   AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
diff --git a/m4/longlong.m4 b/m4/longlong.m4
index d7d7350b3..3716c09f6 100644
--- a/m4/longlong.m4
+++ b/m4/longlong.m4
@@ -1,23 +1,46 @@
-# longlong.m4 serial 4
-dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# longlong.m4 serial 8
+dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Paul Eggert.
 
-# Define HAVE_LONG_LONG if 'long long' works.
+# Define HAVE_LONG_LONG_INT if 'long long int' works.
+# This fixes a bug in Autoconf 2.60, but can be removed once we
+# assume 2.61 everywhere.
 
-AC_DEFUN([jm_AC_TYPE_LONG_LONG],
+# Note: If the type 'long long int' exists but is only 32 bits large
+# (as on some very old compilers), AC_TYPE_LONG_LONG_INT will not be
+# defined. In this case you can treat 'long long int' like 'long int'.
+
+AC_DEFUN([AC_TYPE_LONG_LONG_INT],
+[
+  AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
+    [AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+	  [[long long int ll = 9223372036854775807ll;
+	    long long int nll = -9223372036854775807LL;
+	    typedef int a[((-9223372036854775807LL < 0
+			    && 0 < 9223372036854775807ll)
+			   ? 1 : -1)];
+	    int i = 63;]],
+	  [[long long int llmax = 9223372036854775807ll;
+	    return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+		    | (llmax / ll) | (llmax % ll));]])],
+       [ac_cv_type_long_long_int=yes],
+       [ac_cv_type_long_long_int=no])])
+  if test $ac_cv_type_long_long_int = yes; then
+    AC_DEFINE([HAVE_LONG_LONG_INT], 1,
+      [Define to 1 if the system has the type `long long int'.])
+  fi
+])
+
+# This macro is obsolescent and should go away soon.
+AC_DEFUN([gl_AC_TYPE_LONG_LONG],
 [
-  AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
-  [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
-    [long long llmax = (long long) -1;
-     return ll << i | ll >> i | llmax / ll | llmax % ll;],
-    ac_cv_type_long_long=yes,
-    ac_cv_type_long_long=no)])
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
+  ac_cv_type_long_long=$ac_cv_type_long_long_int
   if test $ac_cv_type_long_long = yes; then
     AC_DEFINE(HAVE_LONG_LONG, 1,
       [Define if you have the 'long long' type.])
diff --git a/m4/nls.m4 b/m4/nls.m4
index 36bc49317..7967cc2f9 100644
--- a/m4/nls.m4
+++ b/m4/nls.m4
@@ -1,10 +1,8 @@
-# nls.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# nls.m4 serial 3 (gettext-0.15)
+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -19,6 +17,8 @@ dnl Authors:
 dnl   Ulrich Drepper <[email protected]>, 1995-2000.
 dnl   Bruno Haible <[email protected]>, 2000-2003.
 
+AC_PREREQ(2.50)
+
 AC_DEFUN([AM_NLS],
 [
   AC_MSG_CHECKING([whether NLS is requested])
@@ -29,21 +29,3 @@ AC_DEFUN([AM_NLS],
   AC_MSG_RESULT($USE_NLS)
   AC_SUBST(USE_NLS)
 ])
-
-AC_DEFUN([AM_MKINSTALLDIRS],
-[
-  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
-  dnl Try to locate it.
-  MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    case "$ac_aux_dir" in
-      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
-      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
-    esac
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-  fi
-  AC_SUBST(MKINSTALLDIRS)
-])
diff --git a/m4/po.m4 b/m4/po.m4
index e16199881..00133ef36 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -1,10 +1,8 @@
-# po.m4 serial 3 (gettext-0.14)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# po.m4 serial 13 (gettext-0.15)
+dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -19,12 +17,14 @@ dnl Authors:
 dnl   Ulrich Drepper <[email protected]>, 1995-2000.
 dnl   Bruno Haible <[email protected]>, 2000-2003.
 
+AC_PREREQ(2.50)
+
 dnl Checks for all prerequisites of the po subdirectory.
 AC_DEFUN([AM_PO_SUBDIRS],
 [
   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
+  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
   AC_REQUIRE([AM_NLS])dnl
 
   dnl Perform the following tests also if --disable-nls has been given,
@@ -34,59 +34,57 @@ AC_DEFUN([AM_PO_SUBDIRS],
   dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
   dnl The second test excludes FreeBSD msgfmt.
   AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
+    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
      (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
     :)
   AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
 
+  dnl Test whether it is GNU msgfmt >= 0.15.
+changequote(,)dnl
+  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([MSGFMT_015])
+changequote(,)dnl
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([GMSGFMT_015])
+
   dnl Search for GNU xgettext 0.12 or newer in the PATH.
   dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
   dnl The second test excludes FreeBSD xgettext.
   AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
      (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
     :)
   dnl Remove leftover from FreeBSD xgettext call.
   rm -f messages.po
 
+  dnl Test whether it is GNU xgettext >= 0.15.
+changequote(,)dnl
+  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([XGETTEXT_015])
+
   dnl Search for GNU msgmerge 0.11 or newer in the PATH.
   AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
+    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
 
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU msgfmt.
-  if test "$GMSGFMT" != ":"; then
-    dnl If it is no GNU msgfmt we define it as : so that the
-    dnl Makefiles still can work.
-    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      AC_MSG_RESULT(
-        [found $GMSGFMT program is not GNU msgfmt; ignore it])
-      GMSGFMT=":"
-    fi
-  fi
-
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU xgettext.
-  if test "$XGETTEXT" != ":"; then
-    dnl If it is no GNU xgettext we define it as : so that the
-    dnl Makefiles still can work.
-    if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      AC_MSG_RESULT(
-        [found xgettext program is not GNU xgettext; ignore it])
-      XGETTEXT=":"
-    fi
-    dnl Remove leftover from FreeBSD xgettext call.
-    rm -f messages.po
-  fi
+  dnl Installation directories.
+  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
+  dnl have to define it here, so that it can be used in po/Makefile.
+  test -n "$localedir" || localedir='${datadir}/locale'
+  AC_SUBST([localedir])
 
-  AC_OUTPUT_COMMANDS([
+  AC_CONFIG_COMMANDS([po-directories], [[
     for ac_file in $CONFIG_FILES; do
       # Support "outfile[:infile[:infile...]]"
       case "$ac_file" in
@@ -106,6 +104,9 @@ AC_DEFUN([AM_PO_SUBDIRS],
           /*) top_srcdir="$ac_given_srcdir" ;;
           *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
         esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
@@ -119,12 +120,13 @@ AC_DEFUN([AM_PO_SUBDIRS],
             if test -n "$OBSOLETE_ALL_LINGUAS"; then
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -194,10 +196,10 @@ AC_DEFUN([AM_PO_SUBDIRS],
         fi
         ;;
       esac
-    done],
+    done]],
    [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake.
+    # from automake < 1.5.
     eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
     # Capture the value of LINGUAS because we need it to compute CATALOGS.
     LINGUAS="${LINGUAS-%UNSET%}"
@@ -283,7 +285,7 @@ x
 changequote([,])dnl
 
   # Set POTFILES to the value of the Makefile variable POTFILES.
-  sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`"
+  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
   POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
   # Compute POTFILES_DEPS as
   #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
@@ -298,14 +300,14 @@ changequote([,])dnl
   fi
   if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
     # The LINGUAS file contains the set of available languages.
-    ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
     POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
   else
     # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
-    sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`"
+    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
     ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
   fi
-  # Hide the ALL_LINGUAS assigment from automake.
+  # Hide the ALL_LINGUAS assigment from automake < 1.5.
   eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
   # Compute POFILES
   # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
@@ -348,7 +350,7 @@ changequote([,])dnl
     QMFILES="$QMFILES $srcdirpre$lang.qm"
     frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
     MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
-    frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
     RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
   done
   # CATALOGS depends on both $ac_dir and the user's LINGUAS
@@ -389,7 +391,7 @@ changequote([,])dnl
       QTCATALOGS="$QTCATALOGS $lang.qm"
       frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
       TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
-      frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
       CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
     done
   fi
@@ -409,7 +411,7 @@ EOF
   if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
     # Add dependencies that cannot be formulated as a simple suffix rule.
     for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
       cat >> "$ac_file.tmp" <<EOF
 $frobbedlang/\$(DOMAIN).resources.dll: $lang.po
 	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4
index 186ba6a6d..af10170af 100644
--- a/m4/printf-posix.m4
+++ b/m4/printf-posix.m4
@@ -1,10 +1,8 @@
 # printf-posix.m4 serial 2 (gettext-0.13.1)
 dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 dnl Test whether the printf() function supports POSIX/XSI format strings with
diff --git a/m4/progtest.m4 b/m4/progtest.m4
index 8fe527cec..a56365cd3 100644
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -1,10 +1,8 @@
-# progtest.m4 serial 3 (gettext-0.12)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# progtest.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -18,6 +16,8 @@ dnl They are *not* in the public domain.
 dnl Authors:
 dnl   Ulrich Drepper <[email protected]>, 1996.
 
+AC_PREREQ(2.50)
+
 # Search path for a program which passes the given test.
 
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
@@ -67,6 +67,7 @@ AC_CACHE_VAL(ac_cv_path_$1,
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
           if [$3]; then
             ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
             break 2
diff --git a/m4/size_max.m4 b/m4/size_max.m4
index 5762fc333..bfba811eb 100644
--- a/m4/size_max.m4
+++ b/m4/size_max.m4
@@ -1,10 +1,8 @@
-# size_max.m4 serial 2
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# size_max.m4 serial 5
+dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
@@ -13,8 +11,9 @@ AC_DEFUN([gl_SIZE_MAX],
   AC_CHECK_HEADERS(stdint.h)
   dnl First test whether the system already has SIZE_MAX.
   AC_MSG_CHECKING([for SIZE_MAX])
-  result=
-  AC_EGREP_CPP([Found it], [
+  AC_CACHE_VAL([gl_cv_size_max], [
+    gl_cv_size_max=
+    AC_EGREP_CPP([Found it], [
 #include <limits.h>
 #if HAVE_STDINT_H
 #include <stdint.h>
@@ -22,40 +21,42 @@ AC_DEFUN([gl_SIZE_MAX],
 #ifdef SIZE_MAX
 Found it
 #endif
-], result=yes)
-  if test -z "$result"; then
-    dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
-    dnl than the type 'unsigned long'.
-    dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
-    dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
-    _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
-      [#include <stddef.h>], result=?)
-    _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
-      [#include <stddef.h>], result=?)
-    _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
-      [#include <stddef.h>], result=?)
-    if test "$fits_in_uint" = 1; then
-      dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
-      dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
-      AC_TRY_COMPILE([#include <stddef.h>
-        extern size_t foo;
-        extern unsigned long foo;
-        ], [], fits_in_uint=0)
-    fi
-    if test -z "$result"; then
-      if test "$fits_in_uint" = 1; then
-        result="$res_hi$res_lo"U
+], gl_cv_size_max=yes)
+    if test -z "$gl_cv_size_max"; then
+      dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
+      dnl than the type 'unsigned long'. Try hard to find a definition that can
+      dnl be used in a preprocessor #if, i.e. doesn't contain a cast.
+      _AC_COMPUTE_INT([sizeof (size_t) * CHAR_BIT - 1], size_t_bits_minus_1,
+        [#include <stddef.h>
+#include <limits.h>], size_t_bits_minus_1=)
+      _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
+        [#include <stddef.h>], fits_in_uint=)
+      if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
+        if test $fits_in_uint = 1; then
+          dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
+          dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
+          AC_TRY_COMPILE([#include <stddef.h>
+            extern size_t foo;
+            extern unsigned long foo;
+            ], [], fits_in_uint=0)
+        fi
+        dnl We cannot use 'expr' to simplify this expression, because 'expr'
+        dnl works only with 'long' integers in the host environment, while we
+        dnl might be cross-compiling from a 32-bit platform to a 64-bit platform.
+        if test $fits_in_uint = 1; then
+          gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
+        else
+          gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
+        fi
       else
-        result="$res_hi$res_lo"UL
+        dnl Shouldn't happen, but who knows...
+        gl_cv_size_max='((size_t)~(size_t)0)'
       fi
-    else
-      dnl Shouldn't happen, but who knows...
-      result='~(size_t)0'
     fi
-  fi
-  AC_MSG_RESULT([$result])
-  if test "$result" != yes; then
-    AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
+  ])
+  AC_MSG_RESULT([$gl_cv_size_max])
+  if test "$gl_cv_size_max" != yes; then
+    AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max],
       [Define as the maximum value of type 'size_t', if the system doesn't define it.])
   fi
 ])
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
index 32ba7ae77..db9a8ac4c 100644
--- a/m4/stdint_h.m4
+++ b/m4/stdint_h.m4
@@ -1,26 +1,24 @@
-# stdint_h.m4 serial 3 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# stdint_h.m4 serial 6
+dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Paul Eggert.
 
 # Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
 # doesn't clash with <sys/types.h>, and declares uintmax_t.
 
-AC_DEFUN([jm_AC_HEADER_STDINT_H],
+AC_DEFUN([gl_AC_HEADER_STDINT_H],
 [
-  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
+  AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h,
   [AC_TRY_COMPILE(
     [#include <sys/types.h>
 #include <stdint.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    jm_ac_cv_header_stdint_h=yes,
-    jm_ac_cv_header_stdint_h=no)])
-  if test $jm_ac_cv_header_stdint_h = yes; then
+    [uintmax_t i = (uintmax_t) -1; return !i;],
+    gl_cv_header_stdint_h=yes,
+    gl_cv_header_stdint_h=no)])
+  if test $gl_cv_header_stdint_h = yes; then
     AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
       [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
        and declares uintmax_t. ])
diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4
index b5f28d440..bf83ed746 100644
--- a/m4/uintmax_t.m4
+++ b/m4/uintmax_t.m4
@@ -1,10 +1,8 @@
-# uintmax_t.m4 serial 7 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# uintmax_t.m4 serial 9
+dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Paul Eggert.
 
@@ -13,12 +11,12 @@ AC_PREREQ(2.13)
 # Define uintmax_t to 'unsigned long' or 'unsigned long long'
 # if it is not already defined in <stdint.h> or <inttypes.h>.
 
-AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
+AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
 [
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
-  if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
-    AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
+    AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
     test $ac_cv_type_unsigned_long_long = yes \
       && ac_type='unsigned long long' \
       || ac_type='unsigned long'
diff --git a/m4/ulonglong.m4 b/m4/ulonglong.m4
index 1da8b809e..9fae98e3a 100644
--- a/m4/ulonglong.m4
+++ b/m4/ulonglong.m4
@@ -1,23 +1,46 @@
-# ulonglong.m4 serial 3
-dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# ulonglong.m4 serial 6
+dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Paul Eggert.
 
-# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
+# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
+# This fixes a bug in Autoconf 2.60, but can be removed once we
+# assume 2.61 everywhere.
 
-AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
+# Note: If the type 'unsigned long long int' exists but is only 32 bits
+# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
+# will not be defined. In this case you can treat 'unsigned long long int'
+# like 'unsigned long int'.
+
+AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
+[
+  AC_CACHE_CHECK([for unsigned long long int],
+    [ac_cv_type_unsigned_long_long_int],
+    [AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+	  [[unsigned long long int ull = 18446744073709551615ULL;
+	    typedef int a[(18446744073709551615ULL <= (unsigned long long int) -1
+			   ? 1 : -1)];
+	   int i = 63;]],
+	  [[unsigned long long int ullmax = 18446744073709551615ull;
+	    return (ull << 63 | ull >> 63 | ull << i | ull >> i
+		    | ullmax / ull | ullmax % ull);]])],
+       [ac_cv_type_unsigned_long_long_int=yes],
+       [ac_cv_type_unsigned_long_long_int=no])])
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+    AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1,
+      [Define to 1 if the system has the type `unsigned long long int'.])
+  fi
+])
+
+# This macro is obsolescent and should go away soon.
+AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
 [
-  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
-  [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
-    [unsigned long long ullmax = (unsigned long long) -1;
-     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
-    ac_cv_type_unsigned_long_long=yes,
-    ac_cv_type_unsigned_long_long=no)])
+  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
+  ac_cv_type_unsigned_long_long=$ac_cv_type_unsigned_long_long_int
   if test $ac_cv_type_unsigned_long_long = yes; then
     AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
       [Define if you have the 'unsigned long long' type.])
diff --git a/m4/visibility.m4 b/m4/visibility.m4
new file mode 100644
index 000000000..2ff6330aa
--- /dev/null
+++ b/m4/visibility.m4
@@ -0,0 +1,52 @@
+# visibility.m4 serial 1 (gettext-0.15)
+dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl Tests whether the compiler supports the command-line option
+dnl -fvisibility=hidden and the function and variable attributes
+dnl __attribute__((__visibility__("hidden"))) and
+dnl __attribute__((__visibility__("default"))).
+dnl Does *not* test for __visibility__("protected") - which has tricky
+dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
+dnl MacOS X.
+dnl Does *not* test for __visibility__("internal") - which has processor
+dnl dependent semantics.
+dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
+dnl "really only recommended for legacy code".
+dnl Set the variable CFLAG_VISIBILITY.
+dnl Defines and sets the variable HAVE_VISIBILITY.
+
+AC_DEFUN([gl_VISIBILITY],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  CFLAG_VISIBILITY=
+  HAVE_VISIBILITY=0
+  if test -n "$GCC"; then
+    AC_MSG_CHECKING([for simple visibility declarations])
+    AC_CACHE_VAL(gl_cv_cc_visibility, [
+      gl_save_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -fvisibility=hidden"
+      AC_TRY_COMPILE(
+        [extern __attribute__((__visibility__("hidden"))) int hiddenvar;
+         extern __attribute__((__visibility__("default"))) int exportedvar;
+         extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+         extern __attribute__((__visibility__("default"))) int exportedfunc (void);],
+        [],
+        gl_cv_cc_visibility=yes,
+        gl_cv_cc_visibility=no)
+      CFLAGS="$gl_save_CFLAGS"])
+    AC_MSG_RESULT([$gl_cv_cc_visibility])
+    if test $gl_cv_cc_visibility = yes; then
+      CFLAG_VISIBILITY="-fvisibility=hidden"
+      HAVE_VISIBILITY=1
+    fi
+  fi
+  AC_SUBST([CFLAG_VISIBILITY])
+  AC_SUBST([HAVE_VISIBILITY])
+  AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
+    [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
+])
diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4
index d8fd1ec5c..cde2129a9 100644
--- a/m4/wchar_t.m4
+++ b/m4/wchar_t.m4
@@ -1,10 +1,8 @@
 # wchar_t.m4 serial 1 (gettext-0.12)
 dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 dnl Test whether <stddef.h> has the 'wchar_t' type.
diff --git a/m4/wint_t.m4 b/m4/wint_t.m4
index 3d8d21594..b8fff9c86 100644
--- a/m4/wint_t.m4
+++ b/m4/wint_t.m4
@@ -1,10 +1,8 @@
 # wint_t.m4 serial 1 (gettext-0.12)
 dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 dnl Test whether <wchar.h> has the 'wint_t' type.
diff --git a/m4/xsize.m4 b/m4/xsize.m4
index 9b7cf9b49..85bb721e4 100644
--- a/m4/xsize.m4
+++ b/m4/xsize.m4
@@ -1,14 +1,13 @@
-# xsize.m4 serial 2
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# xsize.m4 serial 3
+dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_XSIZE],
 [
   dnl Prerequisites of lib/xsize.h.
   AC_REQUIRE([gl_SIZE_MAX])
+  AC_REQUIRE([AC_C_INLINE])
   AC_CHECK_HEADERS(stdint.h)
 ])
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 94b87da32..750616c38 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-23  Werner Koch  <[email protected]>
+
+	Switched entire package to GPLv3+.
+	* longlong.h: Change address notice but keep LGPL.
+	* powerpc32/*: Remove LGPL license cruft in the middle of the
+	files
+
 2007-01-15  David Shaw  <[email protected]>
 
 	* config.links: powerpc64* needs to come before powerpc* or it
diff --git a/mpi/Makefile.am b/mpi/Makefile.am
index 84d77571b..7610e27d0 100644
--- a/mpi/Makefile.am
+++ b/mpi/Makefile.am
@@ -4,7 +4,7 @@
 #
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
 # 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
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 ## Process this file with automake to produce Makefile.in
 
 
diff --git a/mpi/alpha/mpih-add1.S b/mpi/alpha/mpih-add1.S
index 6ea8e38f1..2936b2c3f 100644
--- a/mpi/alpha/mpih-add1.S
+++ b/mpi/alpha/mpih-add1.S
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/mpi/alpha/mpih-lshift.S b/mpi/alpha/mpih-lshift.S
index 45919f51f..112b57d14 100644
--- a/mpi/alpha/mpih-lshift.S
+++ b/mpi/alpha/mpih-lshift.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/alpha/mpih-mul1.S b/mpi/alpha/mpih-mul1.S
index 65b2d5c7e..f09602da8 100644
--- a/mpi/alpha/mpih-mul1.S
+++ b/mpi/alpha/mpih-mul1.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/mpi/alpha/mpih-mul2.S b/mpi/alpha/mpih-mul2.S
index e62ceb982..623c95000 100644
--- a/mpi/alpha/mpih-mul2.S
+++ b/mpi/alpha/mpih-mul2.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/mpi/alpha/mpih-mul3.S b/mpi/alpha/mpih-mul3.S
index de8b0839b..9904677b3 100644
--- a/mpi/alpha/mpih-mul3.S
+++ b/mpi/alpha/mpih-mul3.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/mpi/alpha/mpih-rshift.S b/mpi/alpha/mpih-rshift.S
index 242d2b631..9a90ef5a4 100644
--- a/mpi/alpha/mpih-rshift.S
+++ b/mpi/alpha/mpih-rshift.S
@@ -6,7 +6,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/alpha/mpih-sub1.S b/mpi/alpha/mpih-sub1.S
index 2dea14f30..9df43a6dc 100644
--- a/mpi/alpha/mpih-sub1.S
+++ b/mpi/alpha/mpih-sub1.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/mpi/alpha/udiv-qrnnd.S b/mpi/alpha/udiv-qrnnd.S
index d715908eb..162dc4927 100644
--- a/mpi/alpha/udiv-qrnnd.S
+++ b/mpi/alpha/udiv-qrnnd.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/config.links b/mpi/config.links
index 2f5fae21c..597037424 100644
--- a/mpi/config.links
+++ b/mpi/config.links
@@ -6,7 +6,7 @@
 #
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 # 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
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 # sourced by ../configure to get the list of files to link
 # this should set $mpi_ln_list.
diff --git a/mpi/generic/mpih-add1.c b/mpi/generic/mpih-add1.c
index ebcd13208..2fb72a0b3 100644
--- a/mpi/generic/mpih-add1.c
+++ b/mpi/generic/mpih-add1.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/generic/mpih-lshift.c b/mpi/generic/mpih-lshift.c
index e55cb49c1..83f7d4e39 100644
--- a/mpi/generic/mpih-lshift.c
+++ b/mpi/generic/mpih-lshift.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/generic/mpih-mul1.c b/mpi/generic/mpih-mul1.c
index 2c5c4aeb1..01e6ebcf9 100644
--- a/mpi/generic/mpih-mul1.c
+++ b/mpi/generic/mpih-mul1.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/generic/mpih-mul2.c b/mpi/generic/mpih-mul2.c
index 89ef6b938..67788c8a6 100644
--- a/mpi/generic/mpih-mul2.c
+++ b/mpi/generic/mpih-mul2.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/generic/mpih-mul3.c b/mpi/generic/mpih-mul3.c
index ac473a0d7..4baf4d542 100644
--- a/mpi/generic/mpih-mul3.c
+++ b/mpi/generic/mpih-mul3.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/generic/mpih-rshift.c b/mpi/generic/mpih-rshift.c
index 7aefc59ec..0ea1d89f0 100644
--- a/mpi/generic/mpih-rshift.c
+++ b/mpi/generic/mpih-rshift.c
@@ -6,7 +6,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/generic/mpih-sub1.c b/mpi/generic/mpih-sub1.c
index 2230457c2..c5d918e29 100644
--- a/mpi/generic/mpih-sub1.c
+++ b/mpi/generic/mpih-sub1.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/generic/udiv-w-sdiv.c b/mpi/generic/udiv-w-sdiv.c
index de71011d7..3b7ae1366 100644
--- a/mpi/generic/udiv-w-sdiv.c
+++ b/mpi/generic/udiv-w-sdiv.c
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/mpi/hppa/mpih-add1.S b/mpi/hppa/mpih-add1.S
index fbe93ed7f..fb054c5c4 100644
--- a/mpi/hppa/mpih-add1.S
+++ b/mpi/hppa/mpih-add1.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/hppa/mpih-lshift.S b/mpi/hppa/mpih-lshift.S
index 0c4de141b..71cc529e5 100644
--- a/mpi/hppa/mpih-lshift.S
+++ b/mpi/hppa/mpih-lshift.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/mpi/hppa/mpih-rshift.S b/mpi/hppa/mpih-rshift.S
index d7e691b49..cd9c81a0e 100644
--- a/mpi/hppa/mpih-rshift.S
+++ b/mpi/hppa/mpih-rshift.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/mpi/hppa/mpih-sub1.S b/mpi/hppa/mpih-sub1.S
index c1e20d55b..994fba25f 100644
--- a/mpi/hppa/mpih-sub1.S
+++ b/mpi/hppa/mpih-sub1.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/hppa/udiv-qrnnd.S b/mpi/hppa/udiv-qrnnd.S
index a2024ba17..49e1c335c 100644
--- a/mpi/hppa/udiv-qrnnd.S
+++ b/mpi/hppa/udiv-qrnnd.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/hppa1.1/mpih-mul1.S b/mpi/hppa1.1/mpih-mul1.S
index d1272a76b..41e42af3a 100644
--- a/mpi/hppa1.1/mpih-mul1.S
+++ b/mpi/hppa1.1/mpih-mul1.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/hppa1.1/mpih-mul2.S b/mpi/hppa1.1/mpih-mul2.S
index 18c4dfe03..b8d2bd757 100644
--- a/mpi/hppa1.1/mpih-mul2.S
+++ b/mpi/hppa1.1/mpih-mul2.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/hppa1.1/mpih-mul3.S b/mpi/hppa1.1/mpih-mul3.S
index c5b3925ee..63b9a59ed 100644
--- a/mpi/hppa1.1/mpih-mul3.S
+++ b/mpi/hppa1.1/mpih-mul3.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/hppa1.1/udiv-qrnnd.S b/mpi/hppa1.1/udiv-qrnnd.S
index a086822a8..df376cd13 100644
--- a/mpi/hppa1.1/udiv-qrnnd.S
+++ b/mpi/hppa1.1/udiv-qrnnd.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i386/mpih-add1.S b/mpi/i386/mpih-add1.S
index cc96014c5..024619b95 100644
--- a/mpi/i386/mpih-add1.S
+++ b/mpi/i386/mpih-add1.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i386/mpih-lshift.S b/mpi/i386/mpih-lshift.S
index 9233824fb..e66e51083 100644
--- a/mpi/i386/mpih-lshift.S
+++ b/mpi/i386/mpih-lshift.S
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i386/mpih-mul1.S b/mpi/i386/mpih-mul1.S
index a5f83a50a..2246438ed 100644
--- a/mpi/i386/mpih-mul1.S
+++ b/mpi/i386/mpih-mul1.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i386/mpih-mul2.S b/mpi/i386/mpih-mul2.S
index 6b6c80605..8052dabdc 100644
--- a/mpi/i386/mpih-mul2.S
+++ b/mpi/i386/mpih-mul2.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i386/mpih-mul3.S b/mpi/i386/mpih-mul3.S
index 81e1e432c..707e229bb 100644
--- a/mpi/i386/mpih-mul3.S
+++ b/mpi/i386/mpih-mul3.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i386/mpih-rshift.S b/mpi/i386/mpih-rshift.S
index 43afecec4..644df1b72 100644
--- a/mpi/i386/mpih-rshift.S
+++ b/mpi/i386/mpih-rshift.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i386/mpih-sub1.S b/mpi/i386/mpih-sub1.S
index 9f0dbd8ba..1d37851d9 100644
--- a/mpi/i386/mpih-sub1.S
+++ b/mpi/i386/mpih-sub1.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i386/syntax.h b/mpi/i386/syntax.h
index b656166cb..2e973fc44 100644
--- a/mpi/i386/syntax.h
+++ b/mpi/i386/syntax.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i586/mpih-add1.S b/mpi/i586/mpih-add1.S
index bf9ba2757..cafc38ef2 100644
--- a/mpi/i586/mpih-add1.S
+++ b/mpi/i586/mpih-add1.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/mpi/i586/mpih-lshift.S b/mpi/i586/mpih-lshift.S
index 366f92944..960f5f4ba 100644
--- a/mpi/i586/mpih-lshift.S
+++ b/mpi/i586/mpih-lshift.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i586/mpih-mul1.S b/mpi/i586/mpih-mul1.S
index 198782564..403998934 100644
--- a/mpi/i586/mpih-mul1.S
+++ b/mpi/i586/mpih-mul1.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i586/mpih-mul2.S b/mpi/i586/mpih-mul2.S
index 39c0bbdae..5fafeb3c7 100644
--- a/mpi/i586/mpih-mul2.S
+++ b/mpi/i586/mpih-mul2.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i586/mpih-mul3.S b/mpi/i586/mpih-mul3.S
index 6c1414f66..502870924 100644
--- a/mpi/i586/mpih-mul3.S
+++ b/mpi/i586/mpih-mul3.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i586/mpih-rshift.S b/mpi/i586/mpih-rshift.S
index aeacb689c..e843e923f 100644
--- a/mpi/i586/mpih-rshift.S
+++ b/mpi/i586/mpih-rshift.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/i586/mpih-sub1.S b/mpi/i586/mpih-sub1.S
index 7d3045d65..6e984a9ed 100644
--- a/mpi/i586/mpih-sub1.S
+++ b/mpi/i586/mpih-sub1.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/longlong.h b/mpi/longlong.h
index c0f845c5f..ba437f217 100644
--- a/mpi/longlong.h
+++ b/mpi/longlong.h
@@ -15,9 +15,8 @@ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 License for more details.
 
 You should have received a copy of the GNU Lesser General Public License
-along with this file; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-MA 02110-1301, USA. */
+along with this file; if not, see <http://www.gnu.org/licenses/>.  */
+
 
 /* You have to define the following before including this file:
 
diff --git a/mpi/m68k/mc68020/mpih-mul1.S b/mpi/m68k/mc68020/mpih-mul1.S
index c24305d12..32dedc832 100644
--- a/mpi/m68k/mc68020/mpih-mul1.S
+++ b/mpi/m68k/mc68020/mpih-mul1.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/m68k/mc68020/mpih-mul2.S b/mpi/m68k/mc68020/mpih-mul2.S
index 2684d7d17..c20a4a289 100644
--- a/mpi/m68k/mc68020/mpih-mul2.S
+++ b/mpi/m68k/mc68020/mpih-mul2.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/m68k/mc68020/mpih-mul3.S b/mpi/m68k/mc68020/mpih-mul3.S
index c03115238..823637ed3 100644
--- a/mpi/m68k/mc68020/mpih-mul3.S
+++ b/mpi/m68k/mc68020/mpih-mul3.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/m68k/mpih-add1.S b/mpi/m68k/mpih-add1.S
index c294f9d34..3d9c32529 100644
--- a/mpi/m68k/mpih-add1.S
+++ b/mpi/m68k/mpih-add1.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/m68k/mpih-lshift.S b/mpi/m68k/mpih-lshift.S
index 2256828f8..0951dcafa 100644
--- a/mpi/m68k/mpih-lshift.S
+++ b/mpi/m68k/mpih-lshift.S
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/m68k/mpih-rshift.S b/mpi/m68k/mpih-rshift.S
index e9c20d22f..5b197799d 100644
--- a/mpi/m68k/mpih-rshift.S
+++ b/mpi/m68k/mpih-rshift.S
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/m68k/mpih-sub1.S b/mpi/m68k/mpih-sub1.S
index b5de0b96a..8d00cce08 100644
--- a/mpi/m68k/mpih-sub1.S
+++ b/mpi/m68k/mpih-sub1.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/m68k/syntax.h b/mpi/m68k/syntax.h
index ad27a32ba..2afb59f44 100644
--- a/mpi/m68k/syntax.h
+++ b/mpi/m68k/syntax.h
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mips3/mpih-add1.S b/mpi/mips3/mpih-add1.S
index d3ea91d10..26a26eecb 100644
--- a/mpi/mips3/mpih-add1.S
+++ b/mpi/mips3/mpih-add1.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/mpi/mips3/mpih-lshift.S b/mpi/mips3/mpih-lshift.S
index 7eca648d1..54c973216 100644
--- a/mpi/mips3/mpih-lshift.S
+++ b/mpi/mips3/mpih-lshift.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*******************
diff --git a/mpi/mips3/mpih-mul1.S b/mpi/mips3/mpih-mul1.S
index 0562f4f59..bf1167a8b 100644
--- a/mpi/mips3/mpih-mul1.S
+++ b/mpi/mips3/mpih-mul1.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/mpi/mips3/mpih-mul2.S b/mpi/mips3/mpih-mul2.S
index de5635538..2023cae03 100644
--- a/mpi/mips3/mpih-mul2.S
+++ b/mpi/mips3/mpih-mul2.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/mpi/mips3/mpih-mul3.S b/mpi/mips3/mpih-mul3.S
index 960c5c274..c1e2585bf 100644
--- a/mpi/mips3/mpih-mul3.S
+++ b/mpi/mips3/mpih-mul3.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/mpi/mips3/mpih-rshift.S b/mpi/mips3/mpih-rshift.S
index 2229c504e..4a2eba810 100644
--- a/mpi/mips3/mpih-rshift.S
+++ b/mpi/mips3/mpih-rshift.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*******************
diff --git a/mpi/mips3/mpih-sub1.S b/mpi/mips3/mpih-sub1.S
index d23ff9bd2..fdce07e6d 100644
--- a/mpi/mips3/mpih-sub1.S
+++ b/mpi/mips3/mpih-sub1.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/mpi/mpi-add.c b/mpi/mpi-add.c
index d8bd46b85..8ee951486 100644
--- a/mpi/mpi-add.c
+++ b/mpi/mpi-add.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpi-bit.c b/mpi/mpi-bit.c
index da9d0091d..0405e2b2d 100644
--- a/mpi/mpi-bit.c
+++ b/mpi/mpi-bit.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/mpi/mpi-cmp.c b/mpi/mpi-cmp.c
index 083edbf8a..e119fad04 100644
--- a/mpi/mpi-cmp.c
+++ b/mpi/mpi-cmp.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/mpi/mpi-div.c b/mpi/mpi-div.c
index f29493e68..3309c6356 100644
--- a/mpi/mpi-div.c
+++ b/mpi/mpi-div.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpi-gcd.c b/mpi/mpi-gcd.c
index 6f384cea7..dcdfdfb80 100644
--- a/mpi/mpi-gcd.c
+++ b/mpi/mpi-gcd.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/mpi/mpi-inline.c b/mpi/mpi-inline.c
index 8e29b0615..94982460b 100644
--- a/mpi/mpi-inline.c
+++ b/mpi/mpi-inline.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/mpi/mpi-inline.h b/mpi/mpi-inline.h
index db2c6a970..c32adae12 100644
--- a/mpi/mpi-inline.h
+++ b/mpi/mpi-inline.h
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpi-internal.h b/mpi/mpi-internal.h
index 468037428..c1df30ad8 100644
--- a/mpi/mpi-internal.h
+++ b/mpi/mpi-internal.h
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpi-inv.c b/mpi/mpi-inv.c
index bc4d589ff..b76263047 100644
--- a/mpi/mpi-inv.c
+++ b/mpi/mpi-inv.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/mpi/mpi-mpow.c b/mpi/mpi-mpow.c
index 9a186103a..ed73eda63 100644
--- a/mpi/mpi-mpow.c
+++ b/mpi/mpi-mpow.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/mpi/mpi-mul.c b/mpi/mpi-mul.c
index 97e08ec83..42ae57172 100644
--- a/mpi/mpi-mul.c
+++ b/mpi/mpi-mul.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpi-pow.c b/mpi/mpi-pow.c
index 8fcce5c47..c4c62d7e4 100644
--- a/mpi/mpi-pow.c
+++ b/mpi/mpi-pow.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpi-scan.c b/mpi/mpi-scan.c
index c76f4bb0a..07ed14bdd 100644
--- a/mpi/mpi-scan.c
+++ b/mpi/mpi-scan.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h> 
diff --git a/mpi/mpicoder.c b/mpi/mpicoder.c
index ce60cdee2..cbfe14947 100644
--- a/mpi/mpicoder.c
+++ b/mpi/mpicoder.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/mpi/mpih-cmp.c b/mpi/mpih-cmp.c
index 4c12c715a..63286e600 100644
--- a/mpi/mpih-cmp.c
+++ b/mpi/mpih-cmp.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpih-div.c b/mpi/mpih-div.c
index 1e962a158..235a8107b 100644
--- a/mpi/mpih-div.c
+++ b/mpi/mpih-div.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpih-mul.c b/mpi/mpih-mul.c
index 397ec6066..9cb25ea4c 100644
--- a/mpi/mpih-mul.c
+++ b/mpi/mpih-mul.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/mpiutil.c b/mpi/mpiutil.c
index 91960f8dd..3a1d71fb4 100644
--- a/mpi/mpiutil.c
+++ b/mpi/mpiutil.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/mpi/pa7100/mpih-lshift.S b/mpi/pa7100/mpih-lshift.S
index 55b48faef..e25527c1d 100644
--- a/mpi/pa7100/mpih-lshift.S
+++ b/mpi/pa7100/mpih-lshift.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/mpi/pa7100/mpih-rshift.S b/mpi/pa7100/mpih-rshift.S
index 81906f9f8..4039b173b 100644
--- a/mpi/pa7100/mpih-rshift.S
+++ b/mpi/pa7100/mpih-rshift.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/mpi/power/mpih-add1.S b/mpi/power/mpih-add1.S
index ae8b1a60e..affed4eba 100644
--- a/mpi/power/mpih-add1.S
+++ b/mpi/power/mpih-add1.S
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "sysdep.h"
diff --git a/mpi/power/mpih-lshift.S b/mpi/power/mpih-lshift.S
index 07eb929d1..e5ec4c22c 100644
--- a/mpi/power/mpih-lshift.S
+++ b/mpi/power/mpih-lshift.S
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "sysdep.h"
diff --git a/mpi/power/mpih-mul1.S b/mpi/power/mpih-mul1.S
index 214dbce9c..cec371a3a 100644
--- a/mpi/power/mpih-mul1.S
+++ b/mpi/power/mpih-mul1.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "sysdep.h"
diff --git a/mpi/power/mpih-mul2.S b/mpi/power/mpih-mul2.S
index 571d54e9e..a1b9b5174 100644
--- a/mpi/power/mpih-mul2.S
+++ b/mpi/power/mpih-mul2.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "sysdep.h"
diff --git a/mpi/power/mpih-mul3.S b/mpi/power/mpih-mul3.S
index 192c6f4c4..edb9fbdd2 100644
--- a/mpi/power/mpih-mul3.S
+++ b/mpi/power/mpih-mul3.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "sysdep.h"
diff --git a/mpi/power/mpih-rshift.S b/mpi/power/mpih-rshift.S
index 3214f869e..8fdd46bf5 100644
--- a/mpi/power/mpih-rshift.S
+++ b/mpi/power/mpih-rshift.S
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "sysdep.h"
diff --git a/mpi/power/mpih-sub1.S b/mpi/power/mpih-sub1.S
index d7703ee9d..33fce293f 100644
--- a/mpi/power/mpih-sub1.S
+++ b/mpi/power/mpih-sub1.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "sysdep.h"
diff --git a/mpi/powerpc32/mpih-add1.S b/mpi/powerpc32/mpih-add1.S
index d8f78da02..9563e6dad 100644
--- a/mpi/powerpc32/mpih-add1.S
+++ b/mpi/powerpc32/mpih-add1.S
@@ -1,12 +1,11 @@
 /* PowerPC-32 add_n -- Add two limb vectors of equal, non-zero length.
- *
- *      Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1995, 1997, 1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "sysdep.h"
@@ -63,25 +60,6 @@ Lend:	stw	7,4(3)		# store ultimate result limb
 	blr
 
 #else
-/* Add two limb vectors of equal, non-zero length for PowerPC.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.	*/
-
 #include "sysdep.h"
 #include "asm-syntax.h"
 
diff --git a/mpi/powerpc32/mpih-lshift.S b/mpi/powerpc32/mpih-lshift.S
index 4e5da5b7f..897a029f9 100644
--- a/mpi/powerpc32/mpih-lshift.S
+++ b/mpi/powerpc32/mpih-lshift.S
@@ -1,12 +1,11 @@
 /* PowerPC-32 lshift
- *
- *      Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "sysdep.h"
@@ -75,25 +72,7 @@ Lend2:	slw	0,10,6
 	blr
 
 #else
-/* Shift a limb left, low level routine.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.	*/
-
+        
 /* mp_limb_t mpn_lshift (mp_ptr wp, mp_srcptr up, mp_size_t usize,
 			unsigned int cnt)  */
 
diff --git a/mpi/powerpc32/mpih-mul1.S b/mpi/powerpc32/mpih-mul1.S
index 9f251f10c..67b20c140 100644
--- a/mpi/powerpc32/mpih-mul1.S
+++ b/mpi/powerpc32/mpih-mul1.S
@@ -1,14 +1,14 @@
 /* PowerPC-32 mul_1 -- Multiply a limb vector with a limb and store
  *		       the result in a second limb vector.
  *
- *      Copyright (C) 1992, 1993, 1994, 1995,
+ *      Copyright (C) 1992, 1993, 1994, 1995, 1997
  *                    1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "sysdep.h"
@@ -73,25 +71,6 @@ Lend:	stw	7,4(3)
 	blr
 
 #else
-/* Multiply a limb vector by a limb, for PowerPC.
-   Copyright (C) 1993, 1994, 1995, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.	*/
-
 
 /* mp_limb_t mpn_mul_1 (mp_ptr res_ptr, mp_srcptr s1_ptr,
 			mp_size_t s1_size, mp_limb_t s2_limb)
diff --git a/mpi/powerpc32/mpih-mul2.S b/mpi/powerpc32/mpih-mul2.S
index b562ea699..b0f73a103 100644
--- a/mpi/powerpc32/mpih-mul2.S
+++ b/mpi/powerpc32/mpih-mul2.S
@@ -1,13 +1,12 @@
 /* PowerPC-32 addmul_1 -- Multiply a limb vector with a limb and add
  *			  the result to a second limb vector.
- *
- *      Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1993, 1994, 1995, 1997, 1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "sysdep.h"
@@ -77,25 +74,6 @@ Lend:	stw	8,4(3)
 	blr
 
 #else
-/* Multiply a limb vector by a single limb, for PowerPC.
-   Copyright (C) 1993, 1994, 1995, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.	*/
-
 
 /* mp_limb_t mpn_addmul_1 (mp_ptr res_ptr, mp_srcptr s1_ptr,
 			   mp_size_t s1_size, mp_limb_t s2_limb)
diff --git a/mpi/powerpc32/mpih-mul3.S b/mpi/powerpc32/mpih-mul3.S
index 3b813f9f2..ec15d6e41 100644
--- a/mpi/powerpc32/mpih-mul3.S
+++ b/mpi/powerpc32/mpih-mul3.S
@@ -1,13 +1,13 @@
 /* PowerPC-32 submul_1 -- Multiply a limb vector with a limb and subtract
  *			  the result from a second limb vector.
  *
- *      Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1993, 1994, 1995, 1997, 1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "sysdep.h"
@@ -78,24 +76,6 @@ Lend:	stw	8,4(3)
 	blr
 
 #else
-/* Multiply a limb vector by a single limb, for PowerPC.
-   Copyright (C) 1993, 1994, 1995, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.	*/
 
 /* mp_limb_t mpn_submul_1 (mp_ptr res_ptr, mp_srcptr s1_ptr,
 			   mp_size_t s1_size, mp_limb_t s2_limb)
diff --git a/mpi/powerpc32/mpih-rshift.S b/mpi/powerpc32/mpih-rshift.S
index 4a826b41a..e546ab1f0 100644
--- a/mpi/powerpc32/mpih-rshift.S
+++ b/mpi/powerpc32/mpih-rshift.S
@@ -1,12 +1,11 @@
 /* PowerPC-32 rshift
- *
- *      Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
@@ -74,25 +71,6 @@ Lend2:	srw	0,10,6
 	blr
 
 #else
-/* Shift a limb right, low level routine.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.	*/
-
 
 /* INPUT PARAMETERS
    res_ptr     r3
diff --git a/mpi/powerpc32/mpih-sub1.S b/mpi/powerpc32/mpih-sub1.S
index 89028649a..c110ea78b 100644
--- a/mpi/powerpc32/mpih-sub1.S
+++ b/mpi/powerpc32/mpih-sub1.S
@@ -1,13 +1,12 @@
 /* PowerPC-32  sub_n -- Subtract two limb vectors of the same length > 0
  *			and store difference in a third limb vector.
- *
- *      Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1995, 1997, 1998 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "sysdep.h"
@@ -64,24 +61,6 @@ Lend:	stw	7,4(3)		# store ultimate result limb
 	blr
 
 #else
-/* Subtract two limb vectors of equal, non-zero length for PowerPC.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.	*/
 
 /* mp_limb_t mpn_sub_n (mp_ptr res_ptr, mp_srcptr s1_ptr, mp_srcptr s2_ptr,
 			mp_size_t size)
diff --git a/mpi/powerpc32/syntax.h b/mpi/powerpc32/syntax.h
index 64d9c8611..66f0a0564 100644
--- a/mpi/powerpc32/syntax.h
+++ b/mpi/powerpc32/syntax.h
@@ -1,24 +1,22 @@
 /* gmp2-2.0.2-ppc/mpn/powerpc-linux/syntax.h   Tue Oct	6 19:27:01 1998 */
 /* From glibc's sysdeps/unix/sysv/linux/powerpc/sysdep.h */
-
 /* Copyright (C) 1992, 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.	*/
-
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
 
 #define USE_PPC_PATCHES 1
 
diff --git a/mpi/sparc32/mpih-add1.S b/mpi/sparc32/mpih-add1.S
index 8cd6db628..c6c654c7b 100644
--- a/mpi/sparc32/mpih-add1.S
+++ b/mpi/sparc32/mpih-add1.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/mpi/sparc32/mpih-lshift.S b/mpi/sparc32/mpih-lshift.S
index 2099574ff..fd1286b92 100644
--- a/mpi/sparc32/mpih-lshift.S
+++ b/mpi/sparc32/mpih-lshift.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/mpi/sparc32/mpih-rshift.S b/mpi/sparc32/mpih-rshift.S
index b20dba92a..e5a4794e7 100644
--- a/mpi/sparc32/mpih-rshift.S
+++ b/mpi/sparc32/mpih-rshift.S
@@ -7,7 +7,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 ! INPUT PARAMETERS
diff --git a/mpi/sparc32/udiv.S b/mpi/sparc32/udiv.S
index e4028a61d..6fc6591ee 100644
--- a/mpi/sparc32/udiv.S
+++ b/mpi/sparc32/udiv.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/sparc32v8/mpih-mul1.S b/mpi/sparc32v8/mpih-mul1.S
index 52c911aa8..fc43af17f 100644
--- a/mpi/sparc32v8/mpih-mul1.S
+++ b/mpi/sparc32v8/mpih-mul1.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/sparc32v8/mpih-mul2.S b/mpi/sparc32v8/mpih-mul2.S
index 641b76ade..6b97c5b11 100644
--- a/mpi/sparc32v8/mpih-mul2.S
+++ b/mpi/sparc32v8/mpih-mul2.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/sparc32v8/mpih-mul3.S b/mpi/sparc32v8/mpih-mul3.S
index b11e05a14..bc120d821 100644
--- a/mpi/sparc32v8/mpih-mul3.S
+++ b/mpi/sparc32v8/mpih-mul3.S
@@ -8,7 +8,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/mpi/supersparc/udiv.S b/mpi/supersparc/udiv.S
index 9a1234806..3693eb1b0 100644
--- a/mpi/supersparc/udiv.S
+++ b/mpi/supersparc/udiv.S
@@ -9,7 +9,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -18,9 +18,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Note: This code is heavily based on the GNU MP Library.
  *	 Actually it's the same code with only minor changes in the
diff --git a/po/ChangeLog b/po/ChangeLog
index a5e6ab5a6..b3a9e29b2 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-23  gettextize  <[email protected]>
+
+	* Makefile.in.in: Upgrade to gettext-0.16.1.
+
 2007-03-05  Werner Koch  <[email protected]>
 
 	* LINGUAS: Add nl.
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 53efc5e16..5022b8b18 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,5 +1,5 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper <[email protected]>
+# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <[email protected]>
 #
 # This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU General Public
@@ -8,10 +8,11 @@
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.14
+# Origin: gettext-0.16
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
 SHELL = /bin/sh
 @SET_MAKE@
@@ -22,18 +23,38 @@ VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = @localedir@
 gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
 
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit
@@ -46,7 +67,7 @@ UPDATEPOFILES = @UPDATEPOFILES@
 DUMMYPOFILES = @DUMMYPOFILES@
 DISTFILES.common = Makefile.in.in remove-potcdate.sin \
 $(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
-DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
 $(POFILES) $(GMOFILES) \
 $(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
 
@@ -79,6 +100,12 @@ all: all-@USE_NLS@
 all-yes: stamp-po
 all-no:
 
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
 # stamp-po is a timestamp denoting the last time at which the CATALOGS have
 # been loosely updated. Its purpose is that when a developer or translator
 # checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
@@ -88,10 +115,13 @@ all-no:
 # $(POFILES) has been designed to not touch files that don't need to be
 # changed.
 stamp-po: $(srcdir)/$(DOMAIN).pot
-	test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
-	@echo "touch stamp-po"
-	@echo timestamp > stamp-poT
-	@mv stamp-poT stamp-po
+	test ! -f $(srcdir)/$(DOMAIN).pot || \
+	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+	  echo "touch stamp-po" && \
+	  echo timestamp > stamp-poT && \
+	  mv stamp-poT stamp-po; \
+	}
 
 # Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
 # otherwise packages like GCC can not be built if only parts of the source
@@ -100,11 +130,16 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+	else \
+	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+	fi; \
 	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
 	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
 	  --files-from=$(srcdir)/POTFILES.in \
 	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
-	  --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)'
+	  --msgid-bugs-address="$$msgid_bugs_address"
 	test ! -f $(DOMAIN).po || { \
 	  if test -f $(srcdir)/$(DOMAIN).pot; then \
 	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
@@ -143,7 +178,7 @@ install: install-exec install-data
 install-exec:
 install-data: install-data-@USE_NLS@
 	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	  for file in $(DISTFILES.common) Makevars.template; do \
 	    $(INSTALL_DATA) $(srcdir)/$$file \
 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -156,13 +191,13 @@ install-data: install-data-@USE_NLS@
 	fi
 install-data-no: all
 install-data-yes: all
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -202,19 +237,19 @@ installdirs: installdirs-exec installdirs-data
 installdirs-exec:
 installdirs-data: installdirs-data-@USE_NLS@
 	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	else \
 	  : ; \
 	fi
 installdirs-data-no:
 installdirs-data-yes:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
@@ -289,11 +324,14 @@ dist distdir:
 	$(MAKE) update-po
 	@$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
-dist2: $(DISTFILES)
+dist2: stamp-po $(DISTFILES)
 	dists="$(DISTFILES)"; \
 	if test "$(PACKAGE)" = "gettext-tools"; then \
 	  dists="$$dists Makevars.template"; \
 	fi; \
+	if test -f $(srcdir)/$(DOMAIN).pot; then \
+	  dists="$$dists $(DOMAIN).pot stamp-po"; \
+	fi; \
 	if test -f $(srcdir)/ChangeLog; then \
 	  dists="$$dists ChangeLog"; \
 	fi; \
@@ -305,9 +343,9 @@ dist2: $(DISTFILES)
 	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
 	for file in $$dists; do \
 	  if test -f $$file; then \
-	    cp -p $$file $(distdir); \
+	    cp -p $$file $(distdir) || exit 1; \
 	  else \
-	    cp -p $(srcdir)/$$file $(distdir); \
+	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
 	  fi; \
 	done
 
@@ -354,10 +392,9 @@ $(DUMMYPOFILES):
 update-gmo: Makefile $(GMOFILES)
 	@:
 
-Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
 	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/[email protected] CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
+	  && $(SHELL) ./config.status $(subdir)/[email protected] po-directories
 
 force:
 
diff --git a/po/Makevars.template b/po/Makevars.template
new file mode 100644
index 000000000..32692ab4b
--- /dev/null
+++ b/po/Makevars.template
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/po/be.po b/po/be.po
index 3d418aaca..95d6b7693 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -15,90 +15,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr ""
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr ""
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "запіс у stdout\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -107,14 +107,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -122,62 +122,62 @@ msgid ""
 "the OS a chance to collect more entropy! (Need %d more bytes)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -185,354 +185,358 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 msgid "error reading application data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 #, fuzzy
 msgid "key already exists\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 #, fuzzy
 msgid "generating new key\n"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr ""
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr ""
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr ""
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr ""
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+msgid "unknown armor header: "
+msgstr ""
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr ""
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "нечаканыя даньні"
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr ""
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr ""
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr ""
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr ""
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "памылка CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 msgid "premature eof (in trailer)\n"
 msgstr ""
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr ""
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr ""
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr ""
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 msgid "male"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "female"
 msgstr ""
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 #, fuzzy
 msgid "not forced"
 msgstr "непадтрымліваецца"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 msgid "URL to retrieve public key: "
 msgstr ""
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 #, fuzzy
 msgid "Language preferences: "
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 msgid "not an OpenPGP card"
 msgstr ""
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -540,450 +544,450 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 msgid "   (2) Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "list all available data"
 msgstr "Даведка адсутнічае"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 #, fuzzy
 msgid "change the language preferences"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 #, fuzzy
 msgid "generate new keys"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Загад> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Паўтарыце пароль: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 msgid "PIN not correctly repeated; try again"
 msgstr ""
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr ""
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr ""
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr ""
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr ""
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr ""
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr ""
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr ""
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr ""
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr ""
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr ""
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr ""
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr ""
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr ""
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:61
+#: g10/export.c:59
 msgid "export signatures that are marked as local-only"
 msgstr ""
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/export.c:69
+#: g10/export.c:67
 msgid "remove unusable parts from key during export"
 msgstr ""
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr ""
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr ""
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -991,128 +995,128 @@ msgstr ""
 "@Загады:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[файл]|зрабіць подпіс"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "зашыфраваць даньні"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "разшыфраваць даньні (дапомна)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "праверыць подпіс"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "падпісаць ключ"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "падпісаць ці рэдагаваць ключ"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "экспарт ключоў"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr ""
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "абнавіць усе ключы з паслужніка ключоў"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "імпартаваць/аб'яднаць ключы"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr ""
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr ""
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1122,51 +1126,51 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "выкарыстоўваць у якасьці файла вываду"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "пытацца перад перазапісам"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1174,7 +1178,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1194,15 +1198,15 @@ msgstr ""
 " --list-keys [назвы]        паказаць ключы\n"
 " --fingerprint [назвы]      паказаць адбіткі пальцаў\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1212,7 +1216,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1220,644 +1224,644 @@ msgstr ""
 "\n"
 "Альгарытмы, якія падтрымліваюцца:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr ""
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr ""
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 msgid "[User ID not found]"
 msgstr ""
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "працаваць менш шматслоўна"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr ""
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1865,16 +1869,16 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1888,23 +1892,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr ""
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr ""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1912,19 +1916,19 @@ msgid ""
 "the given value as an interval."
 msgstr ""
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr ""
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr ""
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1933,11 +1937,11 @@ msgid ""
 "Q  to to quit the key generation."
 msgstr ""
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -1978,28 +1982,28 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2007,13 +2011,13 @@ msgid ""
 "a trust connection through another already certified key."
 msgstr ""
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2022,36 +2026,36 @@ msgid ""
 "a second one is available."
 msgstr ""
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Адкажыце \"так\", калі Вы згодны з перазапісам файла"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2067,531 +2071,531 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Даведка адсутнічае"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Для \"%s\" даведка адсутнічае"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 msgid "do not update the trustdb after import"
 msgstr ""
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr ""
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 msgid "remove unusable parts from key after import"
 msgstr ""
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr ""
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr ""
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr ""
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr ""
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr ""
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 msgid "         algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr ""
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr ""
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr ""
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr ""
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr ""
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr ""
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr ""
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr ""
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr ""
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%s: тэчка створана\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr ""
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr ""
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr ""
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr ""
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr ""
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2599,244 +2603,244 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr ""
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr ""
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr ""
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr ""
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr ""
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr ""
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Гэты ключ згубіў састарэў!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 msgid "This will be a self-signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2844,204 +2848,204 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 msgid "Do you really want to do this? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr ""
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr ""
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr ""
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "add a subkey"
 msgstr "дрэнны ключ"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr ""
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 msgid "toggle between the secret and public key listings"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr ""
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr ""
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "set preference list for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr ""
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 msgid "revoke signatures on the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "enable key"
 msgstr "падпісаць ключ"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "disable key"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Даступны сакрэтны ключ.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3049,160 +3053,160 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr ""
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 msgid "Really sign all user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 msgid "Really remove this user ID? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 msgid "You must select exactly one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 msgid "Do you really want to delete this key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 msgid "Set preference list to:\n"
 msgstr ""
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 msgid "Really update the preferences? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Захаваць зьмены? "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Выйсьці не захаваўшы зьмены? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3210,528 +3214,528 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 msgid "invalid"
 msgstr ""
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr ""
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr ""
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr ""
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 #, fuzzy
 msgid "Encrypt"
 msgstr "зашыфраваць даньні"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr ""
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr ""
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr ""
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3741,7 +3745,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3751,48 +3755,48 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 msgid "Key does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 msgid "Signature does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 msgid "Is this correct? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3802,44 +3806,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3847,7 +3851,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -3862,34 +3866,34 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -3897,7 +3901,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3905,754 +3909,754 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 msgid "Really create? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr ""
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr ""
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr ""
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr ""
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr ""
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: створаны зьвязак ключоў\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 msgid "honor the preferred keyserver URL set on the key"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 msgid "disabled"
 msgstr ""
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, c-format
 msgid "searching for names from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "агульная памылка"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/mainproc.c:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, c-format
 msgid "               using %s key %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "Key available at: "
 msgstr "Даведка адсутнічае"
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, c-format
 msgid "                aka \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 #, fuzzy
 msgid "unknown"
 msgstr "невядомая вэрсыя"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr ""
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr ""
 "па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr ""
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr ""
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Файл \"%s\" ужо йснуе. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr ""
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Увядзіце новае ймя файла"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "запіс у stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr ""
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr ""
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: тэчка створана\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, c-format
 msgid " (main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4663,27 +4667,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бітавы %s ключ, ID %08lX, створаны %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Увядзіце пароль\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr ""
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Увядзіце пароль: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4693,21 +4697,21 @@ msgstr ""
 "Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\n"
 "карыстальніка: \""
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Паўтарыце пароль: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4716,425 +4720,425 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 msgid "Are you sure you want to use it? (y/N) "
 msgstr ""
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr ""
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr ""
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr ""
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr ""
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr ""
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr ""
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr ""
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 msgid "No trust value assigned to:\n"
 msgstr ""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr ""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr ""
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr ""
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr ""
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 msgid "  m = back to the main menu\n"
 msgstr ""
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  s = skip this key\n"
 msgstr ""
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = quit [выйсьці]\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr ""
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr ""
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr ""
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 msgid "This key probably belongs to the named user\n"
 msgstr ""
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr ""
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes.\n"
 msgstr ""
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 msgid "Use this key anyway? (y/N) "
 msgstr ""
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr ""
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr ""
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "         This could mean that the signature is forged.\n"
 msgstr ""
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr ""
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr ""
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr ""
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr ""
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr ""
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr ""
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr ""
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr ""
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr ""
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr ""
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr ""
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr ""
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Калі ласка, задайце назву файла даньняў: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "чытаецца stdin ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr ""
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr ""
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr ""
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr ""
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5145,587 +5149,571 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr ""
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 msgid "Is this okay? (y/N) "
 msgstr ""
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr ""
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Недапушчальны пароль. Калі ласка, паспрабуйце шчэ раз"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr ""
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr ""
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr ""
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr ""
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr ""
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "пароль занадта доўгі\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr ""
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr ""
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr ""
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr ""
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "памылка чытаньня файла"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "невядомая вэрсыя"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/verify.c:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5737,306 +5725,306 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "агульная памылка"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr ""
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "невядомая вэрсыя"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr ""
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr ""
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "дрэнны грамадскі ключ"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "дрэнны сакрэтны ключ"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr ""
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "памылка праверчае сумы"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "дрэнны пароль"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr ""
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "немагчыма адчыніць зьвязак ключоў"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr ""
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr ""
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "карыстальнік з такім ID адсутнічае"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "сакрэтны ключ недаступны"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr ""
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "непадтрымліваецца"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "дрэнны ключ"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "памылка чытаньня файла"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "памылка запісу файла"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "памылка адчыненьня файла"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "памылка стварэньня файла"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "нерэчаісны пароль"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr ""
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr ""
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr ""
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr ""
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "дрэнны MPI"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr ""
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr ""
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "дрэнны сэртыфікат"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr ""
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "памылка зачыненьня файла"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "памылка перайменаваньня файла"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "памылка выдаленьня файла"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "нечаканыя даньні"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr ""
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr ""
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr ""
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr ""
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr ""
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr ""
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr ""
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr ""
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr ""
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr ""
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr ""
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr ""
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr ""
 
-#: util/errors.c:109
+#: util/errors.c:107
 #, fuzzy
 msgid "canceled"
 msgstr "скасавана карыстальнікам\n"
 
-#: util/errors.c:110
+#: util/errors.c:108
 msgid "no card"
 msgstr ""
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "зашыфраваць даньні"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr ""
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 #, fuzzy
 msgid "yes"
 msgstr "yes [так]"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "no [не]"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "quit [выйсьці]"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 msgid "cC"
 msgstr ""
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "УВАГА! Выкарыстоўваецца небясьпечная памяць!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 "па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "дзеяньне немагчымае без распачатае бясьпечнае памяці\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index e5415ef7b..7a6d24a00 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -35,92 +35,92 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "no s'ha pogut generar un prim amb pbits=%u qbits=%u\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "no s'ha pogut generar un prim amb menys de %d bits\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "no s'ha trobat cap mòdul d'acumulació d'entropia\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no es pot fer stat de «%s»: %s\n"
 
 # Descartar, deixar passar...  ignorar és un anglicisme.  ivb
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "«%s» no és un fitxer regular: es descarta\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "nota: el fitxer random_seed és buit\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVÍS: el tamany del fitxer random_seed no és vàlid - no s'usarà\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no s'ha pogut llegir «%s»: %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no s'ha pogut escriure «%s»: %s\n"
 
 # No em passe! ;)  ivb
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVÍS: esteu usant un generador de nombres aleatoris insegur!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -134,7 +134,7 @@ msgstr ""
 "NO UTILITZEU CAP DADA GENERADA PER AQUEST PROGRAMA!!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -143,7 +143,7 @@ msgstr ""
 "Si us plau, espereu mentre es genera entropia. Feu alguna tasca si\n"
 "vos ajuda no avorrir-vos, ja que ajudarà a la qualitat de la entropia.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -154,62 +154,62 @@ msgstr ""
 "No hi ha prou bytes aleatoris. Per favor, feu alguna altra cosa per que el\n"
 "sistema tinga oportunitat de recollir més entropia. (Calen %d bytes més)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -217,234 +217,239 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 #, fuzzy
 msgid "key already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera un nou parell de claus"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "la capçalera d'armadura és invàlida: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "capçalera d'armadura: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "la capçalera de signatura clara és invàlida\n"
 
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "capçalera d'armadura: "
+
 # És un missatge d'error?  ivb
 # «Anidada» és un castellanisme.  Niuades?  Imbricades (SC)??  ivb
-#: g10/armor.c:485
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "signatures en text pla imbricades\n"
 
 # FIXME: un-indiar. jm
-#: g10/armor.c:620
+#: g10/armor.c:647
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "la línia escapada amb guió és invàlida: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "fi de fitxer prematur (no CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "fi de fitxer prematur (en CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "CRC malformat\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "error de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fí de fitxer prematur (al final)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "error en l'última línia\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "l'armadura és invàlida: la línia és més llarga que %d caràcters\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "hi ha un caràcter «quoted printable» en l'armadura - probablement s'ha "
 "utilitzat un MTA amb errors\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la clau secreta no està disponible"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 # Destès? ivb
 # Desatès, sí. jm
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "no es pot fet això en mode desatès\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "La vostra selecció? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr "[no establert]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 msgid "male"
 msgstr "home"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "female"
 msgstr "dóna"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "unspecified"
 msgstr "no especificat"
 
@@ -452,134 +457,134 @@ msgstr "no especificat"
 # Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "not forced"
 msgstr "no forçat"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr "forçat"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferències actualitzades"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Empremta digital:"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -587,302 +592,302 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "l'algorisme de protecció és desconegut\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ix del menú"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "show admin commands"
 msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "list all available data"
 msgstr "La clau és disponible en: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the login name"
 msgstr "canvia la data de caducitat"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 #, fuzzy
 msgid "change the language preferences"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nou parell de claus"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Ordre> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "la clau secreta no està disponible"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Introduïu el nom d'usuari: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Introduïu el nom d'usuari: "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Introduïu el nom d'usuari: "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repetiu la contrasenya: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a no ser que especifiqueu la clau per la empremta digital)\n"
 
 # Ahà!  Abans «batch» està tal qual.  Cal unificar.  ivb
 # Fet. jm
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "no es pot fer això en el mode desatès sense «--yes»\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Voleu esborrar aquesta clau de l'anell? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "És una clau secreta! Voleu esborrar-la? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "s'ha netejat la informació de la confiança\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "hi ha una clau secreta per a la clau pública «%s»!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilitzeu l'opció «--delete-secret-keys» per a eliminar-la primer.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "no es pot usar un paquet asimètric ESK al estar en mode S2K\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVÍS: «%s» és un fitxer buit\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "només podeu xifrar a claus RSA de 2048 bits o menys en el mode --pgp2\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "s'està llegint des de «%s»\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "no s'ha pogut utilitzar el xifratge IDEA per a totes les claus per a les que "
 "esteu xifrant.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -891,178 +896,178 @@ msgstr ""
 "forçar l'algoritme de compressió %s (%d) viola les preferències del "
 "destinatari\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s xifrat per a: «%s»\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dades xifrades amb %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
 # És no-wrap?  ivb
 # Com? jm
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATENCIÓ: el missatge s'ha xifrat amb una clau feble durant el xifratge\n"
 "simètric.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "problema en tractar amb un paquet xifrat\n"
 
 # Execució de programes remots, o execució remota de programes? jm
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "no hi ha suport per a l'execució remota de programes\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "les crides a programes externs estan inhabilitades per tindre el fitxer "
 "d'opcions permissos insegurs\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "aquesta plataforma necessita fitxers temporals quan es crida a programes "
 "externs\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "no s'ha pogut executar %s «%s»: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "no s'ha pogut executar %s «%s»: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "s'ha produït un error del sistema en cridar el programa extern: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "s'ha produït una eixida no natural del programa extern\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "no s'ha pogut executar el programa extern\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "no s'ha pogut llegir la resposta del programa extern: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el directori temporal «%s»: %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "La signatura es marcarà com a irrevocable.\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoca una clau secundària"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "la clau secreta és inusable"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "clau %08lX: no està protegida - es descarta\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr ""
 "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVÍS: la clau secreta %08lX no te una simple suma de comprovació SK\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "AVÍS: no s'ha exportat res\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1070,130 +1075,130 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # «de les claus» o «de la clau»?  ivb
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1203,52 +1208,52 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "detall"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1259,7 +1264,7 @@ msgstr ""
 # Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman
 # en el manual original de PGP.  A, B, C...  ivb
 # En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1279,15 +1284,15 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1302,7 +1307,7 @@ msgstr ""
 # Precissament acabem de parlar d'«implementat a la llista del GNOME
 # i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
 # encara no m'agraden massa... jm
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1310,655 +1315,655 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "la extensió de xifrat «%s» no s'ha carregat per tindre permissos insegurs\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVÍS: el programa podria crear un fitxer core!\n"
 
 # FIXME: preferència? jm
 # Ho discutírem en la llista, segur.  Deu ser als arxius.  ivb
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # clares -> en clar?  ivb
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "només podeu fer signatures separades o en clar en el mode --pgp2\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 "
 "habilitat.\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de compressió %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVÍS: s'han donat destinataris (-r) sense usar xifratge de clau pública\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [anell]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de política de certificació donada no és vàlida\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 "hi ha massa entrades en la memòria cau de claus públiques - desactivada\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[No s'ha trobat l'id d'usuari]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "no hi ha una clau secreta per a la subclau pública %08lX - es descarta\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "pren les claus d'aquest anell"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "fes els conflictes de marques de temps només un avís"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informació d'estat en aquest FD"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
 
 # Werner FIXME: should it use «Usage»?
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1966,7 +1971,7 @@ msgstr ""
 "Sintaxi: gpg [opcions] [fitxers]\n"
 "Comprova signatures amb claus conegudes amb confiança\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1976,7 +1981,7 @@ msgstr ""
 "a cap tercer. Ho necessitem per a implementar la xarxa de confiança; no té\n"
 "res a veure amb la xarxa de certificats (creada implícitament)."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1990,17 +1995,17 @@ msgstr ""
 
 # "clau no confiable"? jm
 # No fiable, no de confiança, no de fiar...  ivb
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Si voleu utilitzar aquesta clau no de confiança de totes maneres, dieu «sí»."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Introduïu l'ID d'usuari de la persona a qui voleu enviar el missatge."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2014,7 +2019,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2024,16 +2029,16 @@ msgstr ""
 "xifrar. Aquest algoritme només s'hauria d'usar en tasques concretes.\n"
 "Si us plau, consulteu al vostre expert en seguretat primer."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Introduïu la grandària de la clau"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Contesteu «sí» o «no»"
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2045,19 +2050,19 @@ msgstr ""
 "una bona resposta d'error - en canvi, el sistema tractarà d'interpretar\n"
 "el valor donat com un interval."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Introduïu el nom del propietari de la clau"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "introduïu una adreça de correu (opcional però molt recomanable)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Introduïu un comentari opcional"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2071,11 +2076,11 @@ msgstr ""
 "O  continua la generació de les claus.\n"
 "Q  ix."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Contesteu «sí» (o només «s») si és correcte generar la subclau."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2154,12 +2159,12 @@ msgstr ""
 "\n"
 "Si no sabeu quina és la resposta correcta, contesteu «0»."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Contesteu «sí» si voleu signar TOTS els ID d'usuari"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2167,11 +2172,11 @@ msgstr ""
 "Contesteu «sí» si realment voleu eliminar aquest ID d'usuari.\n"
 "Tots els certificats també es perdran!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Contesteu «sí» si és correcte eliminar la subclau"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2182,7 +2187,7 @@ msgstr ""
 "una connexió de confiança a la clau o a un altra clau certificada\n"
 "per aquesta clau."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2195,7 +2200,7 @@ msgstr ""
 "podria establir una connexió de confiança a través d'una altra clau ja\n"
 "certificada."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2203,7 +2208,7 @@ msgstr ""
 "La signatura no és vàlida. Té sentit que l'elimineu de l'anell\n"
 "de claus."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2217,7 +2222,7 @@ msgstr ""
 "que feu açò només si l'autosignatura no és vàlida per alguna raó i\n"
 "hi ha una segona disponible."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2228,23 +2233,23 @@ msgstr ""
 "a la llista actual de preferències. Les marques de temps de totes les\n"
 "autosignatures afectades s'avançaran un segon.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Per favor, repetiu l'última contrasenya per confirmar-la."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Doneu el nom del fitxer al qual s'aplica la signatura"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Contesteu «sí» si és correcte sobreescriure el fitxer"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2252,7 +2257,7 @@ msgstr ""
 "Introduïu un nom de fitxer. Si premeu RETORN s'hi usarà el fitxer\n"
 "predeterminat (apareix entre claudàtors)."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2281,7 +2286,7 @@ msgstr ""
 "      d'utilitzar més; açò s'utilitza normalment per a marcar una adreça\n"
 "      de correu com a invàlida.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2291,327 +2296,327 @@ msgstr ""
 "certificat de revocació. Per favor, sigueu concisos.\n"
 "Una línia buida indica el final del text.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "No hi ha ajuda disponible"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No hi ha ajuda disponible per a `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "la clau secreta és inusable"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "es descarta un bloc de tipus %d\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "fins ara s'han processat %lu claus\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Nombre total processat: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " claus noves descartades: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                sense ID: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importades: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          no modificades: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       ID d'usuaris nous: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subclaus noves: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        signatures noves: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "       noves revocacions: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "claus privades importades: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claus privades no canviades: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importades: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        signatures noves: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "Heu signat els següents ID d'usuari:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada «%s»\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clau %08lX: l'ID no és vàlid\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "açò pot ser causat per l'absència d'autosignatura\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clau %08lX: clau nova - es descarta \n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "s'està escrivint en «%s»\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clau %08lX: s'ha importat la clau pública «%s»\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clau %08lX: no correspon a la nostra còpia\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clau %08lX: «%s» 1 signatura nova\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clau %08lX: «%s» 1 subclau nova\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clau %08lX: «%s» %d subclaus noves\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clau %08lX: «%s» no ha estat modificada\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hi ha anell secret predeterminat: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clau %08lX: s'ha importat la clau secreta\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clau %08lX: ja es troba en l'anell privat\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau secreta: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2621,22 +2626,22 @@ msgstr ""
 # O «rebutjara»? ivb
 # Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
 # «es rebutja» està bé. jm
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s: es rebutja\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clau %08lX: no hi ha ID per a la signatura\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
@@ -2644,195 +2649,195 @@ msgstr ""
 "s»\n"
 "\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clau %08lX: l'autosignatura no és vàlida en l'id d'usuari «%s»\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clau %08lX: no hi ha una subclau per a la clau de revocació\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clau %08lX: Subclau de revocació no vàlida\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clau %08lX: es descarta l'ID d'usuari '"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clau %08lX: es descarta la subclau\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "clau %08lX: el certificat de revocació és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s - es descarta\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació %"
 "08lX\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
 "present.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "s'ha creat l'anell «%s»\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revocació]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[autosignatura]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 signatura errònia\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signatures errònies\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatura no comprovada per falta de clau\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures no comprovades per falta de clau\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatura no comprovada a causa d'un error\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures no comprovades a causa d'errors\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Ha estat detectat 1 ID sense autosignatura vàlida\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Han estat detectats %d IDs sense autosignatura vàlida\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2844,65 +2849,65 @@ msgstr ""
 "verificar les claus d'altres usuaris (mirant passaports,\n"
 "comprovant empremtes de diferents fonts...)?\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Hi confie marginalment\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Hi confie plenament\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Segur que encara voleu signarla? (s/N) "
 
 # O no s'ha pogut? ivb
 # FIXME: comprovar context. jm
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  No es pot signar.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'ID d'usuari «%s» ha caducat."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'ID d'usuari «%s» no està autosignat."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "L'ID d'usuari «%s» no està autosignat."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2911,11 +2916,11 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voleu ascendir-la a una autosignatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2924,11 +2929,11 @@ msgstr ""
 "La vostra signatura actual en «%s»\n"
 "ha caducat.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Voleu crear una nova signatura per a reemplaçar la caducada? (s/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2937,54 +2942,54 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura local.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "«%s» ja estava signada localment amb la clau %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "«%s» ja estava signada amb la clau %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voleu signarla un altre cop, de tota manera? (s/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "No hi ha res que signar amb la clau %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "La clau ha caducat!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aquesta clau caducarà el %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voleu que la vostra signatura caduque alhora? (S/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "No podeu fer una signatura OpenPGP en una clau PGP 2.x en el mode --pgp2.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Açò inutilitzaria la clau en PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2994,32 +2999,32 @@ msgstr ""
 "pertany realment a la persona esmentada anteriorment? Si no sabeu què \n"
 "contestar, entreu «0».\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No vaig a contestar.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No ho he comprovat en absolut.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He fet algunes comprovacions.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) He fet comprovacions molt acurades.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Seleccioneu una opció (introduïu «?» per obtindre més informació):"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3028,100 +3033,100 @@ msgstr ""
 "Esteu segur que voleu signar aquesta clau\n"
 "amb la vostra clau: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Açò serà una autosignatura.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVÍS: la signatura no es marcarà com a inexportable.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVÍS: la signatura no es marcarà com a irrevocable.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a inexportable.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a irrevocable.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "No he comprovat aquesta clau en absolut.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "He fet algunes comprovacions a aquesta clau.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "He comprovat aquesta clau amb molta cura.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no està protegida.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "La clau està protegida.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No es pot editar aquesta clau: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3129,11 +3134,11 @@ msgstr ""
 "Introduïu la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3142,65 +3147,65 @@ msgstr ""
 "\n"
 
 # No abusis dels pronoms!  (Rowan Atkinson @ Llei i Desordre)  ivb
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Esteu segur de voler fer açò? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "s'està posant la signatura al lloc correcte\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "desa i ix"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra empremta"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "llista claus i ID"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "tria l'ID d'usuari N"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "tria l'ID d'usuari N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca signatures"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signa la clau localment"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "afegeix un ID d'usuari"
 
@@ -3208,153 +3213,153 @@ msgstr "afegeix un ID d'usuari"
 # Si et refereixes a Photo vs. photo, ho deixe en minúscules, que en tot
 # el menú està tot en minúscules. Tb hi ha molts ID vs. id en els msgids
 # i no hem unificat en català. Potser li ho diré a Werner. jm.
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "afegeix un photo ID"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "esborra un ID d'usuari"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "esborra una clau secundària"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "afegeix una clau de revocació"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marca l'ID d'usuari com a primari"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "canvia entre el llistat de claus secretes i públiques"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "llista les preferències (expert)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "llista les preferències (detallat)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "canvia la confiança"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un ID d'usuari"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una clau secundària"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "enable key"
 msgstr "activa una clau"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva una clau"
 
 # Igual que dalt.  ivb
 # Idem :) jm
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra el photo ID"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error en llegir el bloc de claus secretes «%s»: %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "La clau secreta està disponible.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Cal la clau secreta per a fer açò.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Useu l'ordre «toggle» abans.\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3362,246 +3367,246 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "La clau està revocada."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realment voleu signar tots els ID d'usuari? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "la classe de signatura és desconeguda"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "No podeu esborrar l'últim ID d'usuari!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Realment voleu eliminar aquesta clau? "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Realment voleu revocar les claus seleccionades? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estableix la llista de preferències"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realment voleu actualitzar les preferències? "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr "Notació: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hi ha preferències en un ID d'usuari d'estil PGP 2.x.\n"
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3609,19 +3614,19 @@ msgstr ""
 "Teniu en compte que la validesa de la clau mostrada no és necessàriament\n"
 "correcta a no ser que torneu a executar el programa.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3631,7 +3636,7 @@ msgstr ""
 "assumida.\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3640,78 +3645,78 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP2. Afegir un photo ID pot fer que "
 "algunes versions de PGP rebutgen aquesta clau.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
 
 # Aquesta i les següents no haurien de portar (s/N/q) i no (y/N/q)?  ivb
 # Hmm. Sí... (s/N/x) jm
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "invàlida"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3720,379 +3725,379 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n"
 "fer que algunes versions de PGP rebutjen aquesta clau.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "S'està canviant la data de caducitat per a una clau primària.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "es descarta l'autosignatura v3 en l'id d'usuari «%s»\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 "»\n"
 "signat amb la vostra clau %08lX el %s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Esteu segur de que encara voleu revocarla? (s/N) "
 
 # (s/N) ivb
 # S! jm
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta signatura? (s/N) "
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Heu signat els següents ID d'usuari:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVÍS: una signatura d'ID d'usuari està datada %d segons en el futur\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "S'està mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "la preferència %c%lu és duplicada\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "s'està escrivint una signatura directa\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "s'està escrivint l'autosignatura\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "s'està escrivint la signatura de comprovació de la clau\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 #, fuzzy
 msgid "Encrypt"
 msgstr "xifra dades"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (només xifrar)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (només signar)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La grandària sol·licitada és %u bits\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4108,7 +4113,7 @@ msgstr ""
 "      <n>m = la clau caduca als n mesos\n"
 "      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4124,42 +4129,42 @@ msgstr ""
 "      <n>m = la signatura caduca als n mesos\n"
 "      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
 # Amb «it» es refereix a les dates?  ivb
 # Això vaig entendre jo. jm
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4167,12 +4172,12 @@ msgstr ""
 "El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
 "Tanmateix, les tractarà bé fins l'any 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "És correcte? (s/n)"
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 #, fuzzy
 msgid ""
 "\n"
@@ -4189,44 +4194,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot començar amb un dígit\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nom ha de tenir, si més no, 5 caràcters\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "Adreça electrònica: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Esteu usant el joc de caràcters `%s'.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4237,7 +4242,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 
@@ -4254,23 +4259,23 @@ msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4278,12 +4283,12 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4295,7 +4300,7 @@ msgstr ""
 "useu aquest programa amb l'opció \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4307,53 +4312,53 @@ msgstr ""
 "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "La generació de claus ha estat cancel·lada.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "s'està escrivint la clau pública a «%s»\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # Potser no hi haja cap anell! ivb
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no s'ha trobat cap anell públic escrivible: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "s'han creat i signat les claus pública i secreta.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4362,13 +4367,13 @@ msgstr ""
 "Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n"
 "\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4377,7 +4382,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4385,591 +4390,591 @@ msgstr ""
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "mai       "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Política de signatura crítica: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Política de signatura: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Notació de signatura crítica: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Anell"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Empremtes digital de la clau primària:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "     Empremta digital de la subclau:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr " Empremta digital de la clau primària:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "      Empremta digital de la subclau:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Empremta digital ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVÍS: hi ha 2 fitxers amb informació confidencial.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s és el que no ha canviat\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s és el nou\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favor, solucioneu aquest possible problema de seguretat\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "s'està comprovant l'anell «%s»\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 
 # Fitxer indi fins final.  Hau!  ivb
 # Grrr. Com em tracten els esclaus ja... jm
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: s'ha creat l'anell\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVÍS: les opcions en «%s» encara no estan actives durant aquesta execució\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "error de servidor de claus"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no és un ID vàlid\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 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:239
+#: g10/mainproc.c:243
 #, 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:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "clau de sessió xifrada amb %s\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la clau pública és %08lX\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "xifrat amb %lu contrasenyes\n"
 
 # FIXME WK: Use ngettext
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 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:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, 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:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "desxifratge correcte\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVÍS: el missatge no tenia protecció d'integritat\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom del fitxer original='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no es poden tractar aquestes signatures múltiples\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
 # «%.*s» no serà una data?  Caldrà «el» al davant.  ivb
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "La clau és disponible en: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[incert]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "binari"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "desconeguda"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "no és una signatura separada\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 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:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n"
 
 # bolcats de memòria?  ivb
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no s'han pogut desactivar els bolcats de memòria: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "l'algoritme de xifratge no és implementat"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el mòdul de xifratge IDEA no està present\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostra més informació\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
@@ -4977,116 +4982,116 @@ msgstr "AVÍS: %s és una opció desaconsellada.\n"
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "No comprimit"
 
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/misc.c:732
+#: g10/misc.c:730
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "No comprimit"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "aquest missatge pot no ser usable per %s\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "El fitxer «%s» existeix. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: el sufix és desconegut\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Introduïu el nou nom del fitxer"
 
 # Indi?  ivb
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "s'està escrivint en stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "s'asumeix que hi ha dades signades en «%s»\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "AVÍS: les opcions en «%s» encara no estan actives durant aquesta execució\n"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVÍS: la clau de sessió pot estar xifrada simètricament de forma insegura\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d té el bit crític activat\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "hi ha un problema amb l'agent: es deshabilitarà el seu ús\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de la clau principal %08lX)"
@@ -5102,7 +5107,7 @@ msgstr " (ID de la clau principal %08lX)"
 # Se't passava l'argument «*».  printf(3), hieroglyph(7).  ivb
 # Ah!  Prova-ho, no casque alguna cosa :P  ivb
 # Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5113,28 +5118,28 @@ msgstr ""
 "«%2$.*1$s»\n"
 "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Repetiu la contrasenya\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Introduïu la contrasenya\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "s'ha cancel·lat per l'usuari\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "no es pot demanar la contrasenya en mode desatès\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Introduïu la contrasenya: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5144,21 +5149,21 @@ msgstr ""
 "Necessiteu la contrasenya per desblocar la clau secreta de\n"
 "l'usuari: \""
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Repetiu la contrasenya: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5173,165 +5178,165 @@ msgstr ""
 "molt gran!\n"
 "Es recomana una imatge amb una mida aproximada de 240x288.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduïu el nom del fitxer JPEG per al photo ID: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "No s'ha pogut obrir la foto «%s»: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "«%s» no és un fitxer JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "És aquesta foto correcta (s/N/x)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "no s'ha pogut mostrar el photo ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "No s'ha especificat cap raó"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "La clau ha estat substituïda"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "La clau ha estat compromesa"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "La clau ja no s'usa"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "L'ID d'usuari ja no és vàlid"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "raó de la revocació: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "comentari de la revocació: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMxXoO"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "No hi ha cap valor de confiança assignat a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr ""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = No ho sé\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NO confie\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Hi confie absolutament\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = torna al menú principal\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " o = omet aquesta clau\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " x = ix\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "La vostra decisió? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Realment voleu assignar confiança absoluta a aquesta clau? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificats que duen a una clau de confiança absoluta:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Aquesta clau pertany probablement al seu propietari\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Aquesta clau és nostra\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5343,112 +5348,112 @@ msgstr ""
 "«sí» a la següent pregunta\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Voleu usar de tota manera aquesta clau?"
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVÍS: S'està usant una clau no fiable!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
 "present.\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVÍS: Aquesta clau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVÍS: Aquesta clau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "      Açò podria significar que la signatura és falsificada.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVÍS: Aquesta subclau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Aquesta clau ha estat desactivada.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Nota: La clau ha caducat!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVÍS: Aquesta clau no ve certificada per una signatura de confiança!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "    No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVÍS: La clau NO és de confiança!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          Probablement la signatura és FALSA.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "AVÍS: Aquesta clau no ve certificada per signatures prou fiables!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "No és segur que la signatura pertanya al seu propietari.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: es descarta: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: es descarta: la clau pública ja està present\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "No heu especificat un ID d'usuari. (podeu usar «-r»)\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5456,172 +5461,172 @@ msgstr ""
 "\n"
 "Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Usuari inexistent.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "es descarta: la clau pública ja s'ha especificat com a destinatari\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "La clau pública està desactivada.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "es descarta: la clau pública ja està establida\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: es descarta: la clau pública està desactivada\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "no hi ha adreces vàlides\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "les dades no s'han desat; useu l'opció \"--output\" per desar-les\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
 # Indi? ivb
 # Em pense que no. jm
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Signatura separada.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Introduïu el nom del fitxer de dades: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "s'està llegint d'stdin...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "no hi ha dades signades\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "no s'han pogut obrir les dades signades `%s'\n"
 
 # Indi? ivb
 # Yeh... jm
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "el destinatari és anònim; es provarà la clau secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'acord, som el destinatari anònim.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la codificació antiga del DEK no està suportada\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algoritme de xifratge %d%s és desconegut o està desactivat\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: no s'ha trobat l'algoritme de xifratge %d en les preferències\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: la clau secreta %08lX caduca el %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "ha fallat build_packet: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "A ser revocada per:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Aquesta és una clau de revocació sensible)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "s'ha forçat l'eixida d'armadura ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "ha fallat make_keysig_packet: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "l'algorisme de protecció és desconegut\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: Aquesta clau no està protegida!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5640,125 +5645,125 @@ msgstr ""
 "d'impressió de la vostra màquina podria emmagatzemar les dades i fer-les\n"
 "disponibles a altres!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Segurament voleu seleccionar %d ací)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Introduïu una descripció opcional; finalitzeu amb una línia en blanc:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Raó de la revocació: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "És açò correcte? "
 
 # Parts?  Peces?  ivb
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "La contrasenya no és vàlida; torneu a intentar-ho"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "AVÍS: la clau és feble; per favor, canvieu la contrasenya.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "s'està generant la suma de comprovació desaconsellada de 16-bits per a la "
 "protecció de la clau secreta\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "s'hi ha creat una clau feble - reintent\n"
 
 # És no-wrap?  ivb
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "no s'ha pogut evitar una clau feble per a xifratge simètric;\n"
 "hi ha hagut %d intents!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVÍS: conflicte de signatures digest en el missatge\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la clau pública %08lX és %lu segons anterior a la signatura\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la clau pública %08lX és %lu segons anterior a la signatura\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5767,7 +5772,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5775,61 +5780,39 @@ msgstr ""
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: la clau de signatura %08lX va caducar el %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "es supossa una signatura incorrecta de la clau %08lX a causa d'un bit crític "
 "desconegut\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "clau %08lX: no hi ha una subclau per al paquet de la subclau de revocació\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "clau %08lX: no hi ha una subclau per a la signatura de l'enllaç de la "
 "subclau\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"no es poden ficar dades de notació dins de signatures v3 (estil PGP 2.x)\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"no es poden ficar dades de notació dins de signatures de clau v3 (estil PGP "
-"2.x)\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVÍS: no s'ha pogut %%-expandir la notació (massa gran). S'utilitza no "
 "expandida.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"no es pot ficar una URL de política dins de signatures v3 (estil PGP 2.x)\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"no es pot ficar una URL de política dins de signatures de clau v3 (estil PGP "
-"2.x)\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5837,7 +5820,7 @@ msgstr ""
 "AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
 "no expandida.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5846,76 +5829,76 @@ msgstr ""
 "AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
 "no expandida.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatura de: «%s»\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "només podeu fer signatures separades amb claus d'estil PGP 2.x mentre esteu "
 "en mode --pgp2\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar l'algoritme de digest %s (%d) viola les preferències del destinatari\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "només podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "s'utilitzarà xifratge %s\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la clau no està marcada com a insegura - no es pot utilitzar amb el GNA "
 "fals!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "es descarta «%s»: duplicat\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "es descarta «%s»: %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "es descarta «%s»: és una clau ElGamal generada per PGP que no és segura per "
 "a signatures!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5924,361 +5907,361 @@ msgstr ""
 "# Llista de valors de confiança assignats, creat el %s\n"
 "# (Utilitzeu «gpg --import-ownertrust» per a restaurar-les)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "la línia és massa llarga\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importa els valors de confiança"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "error en trobar el registre de confiança: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "error de lectura: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "reg de la base de dades de confiança %lu: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "reg de la base de dades de confiança %lu: ha fallat la escriptura (n=%d): %"
 "s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "la transacció de la base de dades de confiança és massa gran\n"
 
 # No em passe! ;)  ivb
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: el directori no existeix!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: no s'ha pogut crear un registre de versió: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: s'ha creat una base de dades de confiança invàlida\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: s'ha creat la base de dades de confiança\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: no es pot escriure en la base de dades de confiança\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: la base de dades de confiança és invàlida\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error en actualitzar el registre de la versió: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error en llegir el registre de la versió: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error en escriure el registre de la versió: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dades de confiança: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s no és un fitxer de base de dades de confiança\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registre de versió amb número de registre %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: la versió de fitxer %d és invàlida\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: no s'ha pogut posar a zero un registre: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: no s'ha pogut afegir un registre: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "la base de dades de confiança està corrompuda; per favor, executeu «gpg --"
 "fix-trustdb».\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "no es poden tractar línies més llargues de %d caràcters\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "la línia d'entrada és superior a %d caràcters\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "«%s» no és un ID de clau llarg vàlid\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "clau %08lX: s'accepta com a clau fiable\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 "la clau %08lX apareix més d'una vegada en la base de dades de confiança\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "clau %08lX: no hi ha una clau pública per a la clau fiable - es descarta\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "s'ha marcat la clau com a de confiança absoluta.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut llegir: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "el registre de confiança %lu no és del tipus demanat %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocada]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "desconeguda"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la pròxima comprovació de la base de dades de confiança serà el %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "no s'ha trobat la clau pública %08lX: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "si us plau, feu un --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "s'està comprovant la base de dades de confiança\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "no s'han trobat claus amb confiança absoluta\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "no s'ha trobat la clau pública de la clau amb confiança absoluta %08lX\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 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:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6294,205 +6277,205 @@ msgstr ""
 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"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "error general"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "el tipus de paquet és desconegut"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "la versió és desconeguda"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "l'algoritme de clau pública és desconegut"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "l'algoritme de resum és desconegut"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "la clau pública és errònia"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "la clau secreta és errònia"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "la signatura és errònia"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "la suma de control és errònia"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "la contrasenya és errònia"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "no s'ha trobat la clau pública"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "l'algoritme de xifratge és desconegut"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "no s'ha pogut obrir l'anell"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "el paquet és invàlid"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "l'armadura és invàlida"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "no s'ha trobat l'id de l'usuari"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "la clau secreta no està disponible"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "s'ha utilitzat una clau secreta incorrecta"
 
 # Gènere?  Nombre?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "no és suportat"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "la clau és incorrecta"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "error de lectura"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "error d'escriptura"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "l'algoritme de compressió és desconegut"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "error en l'obertura del fitxer"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "error en la creació del fitxer"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "la contrasenya és invàlida"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "l'algoritme de clau pública no és implementat"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "l'algoritme de xifratge no és implementat"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "la classe de signatura és desconeguda"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "error de la base de dades de confiança"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "l'MPI és erroni"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "límit de recursos"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "l'anell no és vàlid"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "el certificat és incorrecte"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "l'id d'usuari és malformat"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "error en el tancament del fitxer"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "error en el reanomenament del fitxer"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "error en l'eliminació del fitxer"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "dades inesperades"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "conflicte de data"
 
 # Ací veus pq jo pose «no és vàlid» en comptes de «és invàlid».  ivb
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "l'algoritme de clau pública és inusable"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "el fitxer existeix"
 
 # Segons context: la clau és feble?  ivb
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "clau feble"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "l'argument és invàlid"
 
 # La «U» és masculina o femenina?  ivb
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "l'URI és errònia"
 
 # Ídem.  ivb
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "l'URI no és suportada"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "error de la xarxa"
 
 # Gènere?  Nombre?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "no és xifrat"
 
@@ -6500,24 +6483,24 @@ msgstr "no és xifrat"
 # Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "no processat"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "ls clau pública és inusable"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "la clau secreta és inusable"
 
 # «del servidor», «en el servidor»?  ivb
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "error de servidor de claus"
 
-#: util/errors.c:109
+#: util/errors.c:107
 #, fuzzy
 msgid "canceled"
 msgstr "Cancel·la"
@@ -6525,100 +6508,119 @@ msgstr "Cancel·la"
 # Gènere?  Nombre?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: util/errors.c:110
+#: util/errors.c:108
 #, fuzzy
 msgid "no card"
 msgstr "no és xifrat"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "no hi ha dades signades\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... açò és un bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "heu trobat un bug... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "sí|si"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "ix"
 
 # «xX»?  ivb
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "xX"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "AVÍS: esteu usant memòria insegura!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 "si us plau, visiteu http://www.gnupg.org/faq.html per a més informació\n"
 
 # Últimament pense si «iniciar» no serà millor que «inicialitzar»?  ivb
 # Segons SC, hi ha diferència. jm
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "l'operació no és possible sense memòria segura inicialitzada\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "no es poden ficar dades de notació dins de signatures v3 (estil PGP 2.x)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "no es poden ficar dades de notació dins de signatures de clau v3 (estil "
+#~ "PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "no es pot ficar una URL de política dins de signatures v3 (estil PGP 2."
+#~ "x)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "no es pot ficar una URL de política dins de signatures de clau v3 (estil "
+#~ "PGP 2.x)\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n"
 
diff --git a/po/cs.po b/po/cs.po
index 7321536bc..0ef285f56 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -15,90 +15,90 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "nemohu vygenerovat prvo��slo s  pbits=%u qbits=%u\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "nemohu vygenerovat prvo��slo s m�n� ne� %d bity\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "nebyl detekov�n ��dn� modul pro z�sk�n� entropie\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "nelze zam��t `%s'\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nemohu pou��t p��kaz stat na `%s': %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nen� norm�ln� soubor - ignoruji\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "pozn�mka: soubor random_seed je pr�zdn�\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "VAROV�N�: neplatn� velikost random_seed - soubor nepou�it\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nemohu ��st `%s': %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: soubor random_seed nen� aktualizov�n\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nemohu zapisovat do `%s': %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nemohu zav��t `%s': %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROV�N�: pou�it� gener�tor n�hodn�ch ��sel nen� bezpe�n�!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -112,7 +112,7 @@ msgstr ""
 "NEPOU��VEJTE JAK�KOLIV DATA VYTVO�EN� T�MTO PROGRAMEM!!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -121,7 +121,7 @@ msgstr ""
 "Pros�m �ekejte, je nutn� z�skat dostatek entropie. Aby jste se nenudili,\n"
 "m��ete na po��ta�i d�lat n�co jin�ho, zv���te tak kvalitu entropie.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -132,62 +132,62 @@ msgstr ""
 "Nedostatek n�hodn�ch bajt�. Pros�m, pracujte s opera�n�m syst�mem, abyste\n"
 "mu umo�nili z�skat v�ce entropie (je pot�eba %d bajt�).\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ulo�en� datumu vytvo�en� se nezda�ilo: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr "odpov�� neobsahuje ve�ejn� kl��\n"
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpov�� neobsahuje RSA modulus\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpov�� neobsahuje ve�ejn� RSA exponent\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback zkon�ila chybou: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN pro CHV%d je p��li� kr�tk�; minim�ln� d�lka je %d\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verifikace CHV%d se nezda�ila: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr "p��stup k administr�torsk�m p��kaz�m nen� nakonfigurov�n\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr "chyba p�i z�sk�n� CHV z karty\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzam�ena!\n"
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -196,346 +196,351 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr "|A|PIN administr�tora"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nov� PIN administr�tora"
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr "|N|Nov� PIN"
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 msgid "error reading application data\n"
 msgstr "chyba p�i �ten� aplika�n�ch dat\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 msgid "error reading fingerprint DO\n"
 msgstr "chyba p�i �ten� fingerpritnu DO\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 msgid "key already exists\n"
 msgstr "kl�� ji� existuje\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr "existuj�c� kl�� bude p�eps�n\n"
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 msgid "generating new key\n"
 msgstr "generov�n� nov�ho kl��e\n"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr "chyb� �asov� raz�tko vytvo�en�\n"
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "sch�z� RSA modulus nebo nem� velikost %d bit�\n"
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "sch�z� ve�ejn� RSA exponent nebo je del�� ne� %d bit�\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "sch�z� RSA prime %s nebo nem� velikost %d bit�\n"
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr "pros�m po�kejte ne� bude kl�� vygenerov�n ...\n"
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 msgid "generating key failed\n"
 msgstr "henerov�n� kl��e se nezda�ilo\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generov�n� kl��e dokon�eno (%d sekund)\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "neplatn� struktura OpenPGP kraty (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dosud vytvo�en� podpisy: %lu\n"
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "ov��en� administr�torsk�ho PIN je nyn� prost�ednictv�m tohoto p��kazu "
 "zak�z�no\n"
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII k�dov�n�: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "neplatn� hlavi�ka ASCII k�dov�n�: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "ASCII hlavi�ka: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "neplatn� hlavi�ka podpisu v �iteln�m form�tu\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "ASCII hlavi�ka: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "vno�en� podpisy v �iteln�m form�tu\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 msgid "unexpected armor: "
 msgstr "neo�ek�van� ASCII armor: "
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "nespr�vn� ozna�en� ��dku m�nusy: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatn� radix64 znak %02X byl p�esko�en\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "�patn� form�t CRC\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 msgid "premature eof (in trailer)\n"
 msgstr "p�ed�asn� konec souboru (v pati�ce)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "chyba v pati�ce\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenalezena ��dn� platn� data ve form�tu OpenPGP.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatn� k�dov�n� ASCII: ��dek je del�� ne� %d znak�\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "neplatn� znak (quoted-printable) v ASCII k�dov�n� - pravd�podobn� byl pou�it "
 "�patn� MTA\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGp karta nen� dostupn�: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta ��slo %s\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "V� v�b�r? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr "[nen� nastaven]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 msgid "male"
 msgstr "mu�"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "female"
 msgstr "�ena"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "unspecified"
 msgstr "neuvedeno"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "not forced"
 msgstr "nen� vy�adov�no"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr "vy�adov�no"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Chyba: V sou�asn� verzi je povolenou pouze plain ASCII.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Chyba: Znak \"<\" nelze pou��t.\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Chyba: V�ce mezer nen� povoleno.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr "P��jmen� dr�itele karty: "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr "Jm�no (k�estn�) dr�itele karty: "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Chyba: jm�no a p��jmen� je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 msgid "URL to retrieve public key: "
 msgstr "URL pro z�sk�n� ve�ejn�ho kl��e: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Chyba: URL je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr "Login (jm�nu ��tu): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Chyba: Login je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr "Priv�tn� DO data: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Chyba: Priv�tn� DO je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 msgid "Language preferences: "
 msgstr "Jazykov� p�edvolby: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 msgid "Error: invalid length of preference string.\n"
 msgstr "Chyba: neplatn� d�lka �etezce s p�edvolbami.\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Chyba: neplatn� znak v �et�zci s p�edvolbami\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Zadejte pohlav�: M - mu�sk�, F - �ensk� nebo stisn�te mezern�k: "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 msgid "Error: invalid response.\n"
 msgstr "Chyba: neplatn� odpov��.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Chyba: nespr�vn� naform�tovan� fingerprint.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operace s kl��em nen� mo�n�: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 msgid "not an OpenPGP card"
 msgstr "toto nen� OpenPGP karta"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr "P�epsat existuj�c� kl��? (a/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Vytvo�it z�lohu �ifrovac�ho kl��e mimo kartu? (A/n) "
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr "P�epsat existuj�c� kl��e? (a/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -546,138 +551,138 @@ msgstr ""
 "   PIN = `%s'     PIN administr�tora = `%s'\n"
 "Toto nastaven� m��ete zm�nit p��kazem --change-pin\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 msgid "Please select the type of key to generate:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete generovat:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 msgid "   (1) Signature key\n"
 msgstr "   (1) Podepisovac� kl��\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �ifrovac� kl��\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�n� kl��\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 msgid "Please select where to store the key:\n"
 msgstr "Pros�m vyberte m�sto pro uchov�n� kl��e:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�m� algoritmus pro ochranu kl��e\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 msgid "secret parts of key are not available\n"
 msgstr "tajn� ��sti kl�e nejsou dostupn�\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 msgid "secret key already stored on a card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "show admin commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "list all available data"
 msgstr "vypi� v�echna dostupn� data"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr "zm�n� jm�no majitele karty"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr "zm�n� URL pro z�sk�n� kl��e"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr "z�sk� kl�� specifikovan� v URL karty"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change the login name"
 msgstr "zm�nit login name"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "change the language preferences"
 msgstr "zm�nit jazykov� p�edvolby"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr "zm�n� pohlav� dr�itele karty"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "change a CA fingerprint"
 msgstr "vypsat fingerprint certifika�n� autority"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr "zapnout/vypnout po�adov�n� PINu p�i ka�d� self-sign operaci"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 msgid "generate new keys"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr "nab�dka pro zm�nu anebo odblokov�n� PINu"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr "ov�� PIN a vypi� v�echna data"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "P��kaz> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 msgid "Admin-only command\n"
 msgstr "pouze administr�torsk� p��kazy\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 msgid "Admin commands are allowed\n"
 msgstr "administr�torsk� p��kazy jsou povoleny\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 msgid "Admin commands are not allowed\n"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "tajn� kl�� nen� dostupn�"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Pros�m vo�te kartu a stiskn�te enter. Operaci zru��te stisknut�m 'z': "
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -686,140 +691,140 @@ msgstr ""
 "Pros�m vyjm�te kartu a vlo�te jinou se seriov�m ��slem:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 "Je-li nov� karta p�ipravena, stiskn�te enter.  Operaci zru��te stisknut�m "
 "'z': "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr "Vlo�te nov� PIN administr�tora: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr "Vlo�te nov� PIN: "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr "Vlo�te PIN administr�tora: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr "Vlo�te PIN: "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 msgid "Repeat this PIN: "
 msgstr "Opakujte tento PIN: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN nen� zopakov�n spr�vn�; zkuste to znovu"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba p�i �ten� bloku kl��e: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(dokud neur��te kl�� jeho fingerprintem)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "bez parametru \"--yes\" to nemohu v d�vkov�m m�du prov�st\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Smazat tento kl�� ze souboru kl���? (a/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Toto je tajn� kl��! - opravdu smazat? (a/N) "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "informace o d�v�ryhodnosti vlastn�ka kl��e vymaz�ny\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "existuje tajn� kl�� pro tento ve�ejn� kl�� \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "abyste ho smazal(a), pou�ijte nejprve parametr \"--delete-secret-key\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "v m�du S2K nelze pou��t symetrick� ESK paket\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "pou�it� �ifry: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' je ji� zkomprimov�n\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROV�N�: soubor `%s' je pr�zdn�\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete �ifrovat pouze RSA kl��em o d�lce 2048 bit� a m�n�\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "�tu z `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "algoritmus IDEA nelze pou��t pro v�echny kl��e, pro kter� �ifrujete.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "VAROV�N�: vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -828,166 +833,166 @@ msgstr ""
 "VAROV�N�: vy��dan� komprima�n� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pro: %s\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� data\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrov�no nezn�m�m algoritmem %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "VAROV�N�: zpr�va byla za�ifrov�na slab�m kl��em v symetrick� �if�e.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "probl�m se za�ifrovan�m paketem\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "spu�t�n� extern�ho programu nen� podporov�no\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "vol�n� extern�ch program� je zak�z�no, proto�e file permissions nejsou\n"
 "nastaveny nebezpe�n�\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "na t�to platform� jsou p�i vol�n� extern�ch program� vy�adov�ny\n"
 "do�asn� soubory (temp files)\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "nelze spustit program `%s': %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nelze spustit shell `%s': %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "syst�mov� chyba p�i vol�n� extern�ho programu: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "neo�ek�van� konec extern�ho programu\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "nelze spustit extern� program\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "nelze p�e��st odpov�� extern�ho programu: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "VAROV�N�: nelze smazat do�asn� soubor (%s) `%s': %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROV�N�: nelze smazat do�asn� adres�� `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "pro \"%s\" nebyl nalezen ��dn� revoka�n� kl��\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revokovat kl�� nebo vybran� podkl��e"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "odstranit nepou�iteln� ��sti z kl��e"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 msgid "exporting secret keys not allowed\n"
 msgstr "exportov�n� tajn�ho kl��e nen� povoleno\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "kl�� %s: nen� chr�n�n� - p�esko�eno\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kl�� %s: PGP 2.x kl�� - p�esko�eno\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "kl�� %s: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VAROV�N�: tajn� kl�� %s nen� chr�n�n pomoc� simple SK checksum\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -995,127 +1000,127 @@ msgstr ""
 "@P��kazy:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "vypsat seznam kl��� a podpis�"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy kl���"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a fingerprint�"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "odstranit kl�� ze souboru tajn�ch kl���"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "podepsat kl��"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat kl��"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat v�echny kl��e ze serveru kl���"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "importovat/slou�it kl��e"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr "zm�nit data na kart�"
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr "zm�nit PIN karty"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]  vypi� hash"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1125,55 +1130,55 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou��t tento id u�ivatele pro podeps�n�\n"
 " nebo de�ifrov�n�"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
 " komprimace)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "vy��dat potvrzen� p�ed p�eps�n�m"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr "pou��t chov�n� striktn� podle OpenPGP"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1181,7 +1186,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1199,17 +1204,17 @@ msgstr ""
 " --list-keys [jm�na]        vypsat kl��e\n"
 " --fingerprint [jm�na]      vypsat fingerprinty \n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
 "P�ipom�nky k p�ekladu <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1219,7 +1224,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1227,79 +1232,79 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "�ifra: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis nalezen v definici skupiny `%s'\n"
 
 # g10/g10.c:1179#, c-format
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� domovsk�ho adres��e nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� konfigura�n�ho souboru nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� roz�i�uj�c�ho modulu nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro domovsk� adres��e nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro konfigura�n� soubor nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROV�N�: p��stupov� pr�va roz�i�uj�c�mu modulu nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s domovk�m adres��em nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1307,21 +1312,21 @@ msgstr ""
 "VAROV�N�: vlastnictv� adres��e s konfigura�n�m souborem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s roz�i�uj�c�m modulem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va k adres��i s domovsk�m adres��em nejsou nastavena "
 "bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1329,7 +1334,7 @@ msgstr ""
 "VAROV�N�: p��stupov� pr�va k aders��i s konfigura�n�m souborem nejsou "
 "nastavena bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
@@ -1337,548 +1342,548 @@ msgstr ""
 "nastavena bezpe�n� `%s'\n"
 
 # c-format
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "p�epnout mezi vypisem seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� soubor s mo�nostmi `%s ignorov�n'\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nen� pro norm�ln� pou�it�!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra `%s' nebyla nahr�na, proto�e p��stupov� pr�va nejsou nastavena "
 "bezpe�n�\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "POZN�MKA: %s nen� v t�to verzi dostupn�\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nelze spustit s nebezpe�nou pam�t� vzhledem k %s\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et pouze odd�len� podpisy nebo podpisy �iteln� "
 "jako text\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�du --pgp2 nelze sou�asn� �ifrovat a podepisovat\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�du --pgp2 mus�te pou��t soubor (ne rouru).\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrov�n� zpr�v v m�du --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� b�t v�t�� ne� 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� b�t v�t�� ne� 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� b�t v rozmez� od 1 do 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "neplatn� implicitn� �rove� certifikace (default-cert-level); mus� b�t 0, 1, "
 "2 nebo 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "neplatn� minim�ln� �rove� certifikace (min-cert-level); mus� b�t 0, 1, 2 "
 "nebo 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razn� nedoporu�ov�n\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� b�t 0, 1 nebo 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "pou�it� �ifrovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "pou�it� hashovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pou�it� komprima�n�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROV�N�: specifikov�n adres�t (-r) bez pou�it� �ifrov�n� s ve�ejn�m kl��em\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --encrypt v m�du %s\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt v m�du %s\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u�ivatele] [soubor s kl��i (keyring)]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "p��li� mnoho polo�ek v bufferu ve�ejn�ch kl��� - vypnuto\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 msgid "[User ID not found]"
 msgstr "[ID u�ivatele nenalezeno]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
 # c-format
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Neplatn� kl�� %s zm�n�n na platn� pomoc� --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %s - ignorov�no\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��v�m podkl�� %s m�sto prim�rn�ho kl��e %s\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kl�� %s: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "b�t o trochu v�c tich�"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "ber kl��e z t�to kl��enky (keyringu)"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "pouze varov�n� p�i konfliktu �asov�ho raz�tka"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1886,7 +1891,7 @@ msgstr ""
 "Syntaxe: gpg [volby] [souboru]\n"
 "Ov��� podpisy proti zn�m�m, d�v�ryhodn�m kl���m\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1897,7 +1902,7 @@ msgstr ""
 "d�v�ry\"; nem� to nic spole�n�ho s (implicitn� vytvo�enou) \"pavu�inou\n"
 "certifik�t�\"."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1909,17 +1914,17 @@ msgstr ""
 "k tajn�m kl���m. Odpov�zte \"ano\", abyste nastavili tyto kl��e\n"
 "jako absolutn� d�v�ryhodn�\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Pokud p�esto chcete pou��t tento ned�v�ryhodn� kl��, odpov�zte \"ano\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Vlo�te identifik�tor adres�ta, kter�mu chcete poslat zpr�vu."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1943,7 +1948,7 @@ msgstr ""
 "\n"
 "Prvn� (prim�rn�) kl�� mus� b�t v�dy kl��, pomoc� kter�ho lze podepisovat."
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1953,16 +1958,16 @@ msgstr ""
 "Tento algoritmus je vhodn� pou��t jen za jist�ch podm�nek.\n"
 "Kontaktujte pros�m nejprve bezpe�nostn�ho specialistu."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Vlo�te d�lku kl��e"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Odpov�zte \"ano\" nebo \"ne\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1974,19 +1979,19 @@ msgstr ""
 "spr�vnou chybovou hl�ku - m�sto toho syst�m zkus� interpretovat\n"
 "zadanou hodnotu jako interval."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Vlo�te jm�no dr�itele kl��e"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "pros�m, vlo�te e-mailovou adresu (nepovinn�, ale velmi doporu�ovan�)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Pros�m, vlo�te nepovinn� koment��"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2000,11 +2005,11 @@ msgstr ""
 "O  pro pokra�ov�n� generov�n� kl��e.\n"
 "Q  pro ukon�en� generov�n� kl��e."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Jestli�e chcete generovat podkl��, odpov�zte \"ano\" (nebo jen \"a\")."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2077,12 +2082,12 @@ msgstr ""
 "\n"
 "Pokud nev�te, jak� je spr�vn� odpov��, odpov�zte \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 "Pokud chcete podepsat V�ECHNY identifik�tory u�ivatel�, odpov�zte \"ano\""
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2091,11 +2096,11 @@ msgstr ""
 "\".\n"
 "V�echny certifik�ty budou tak� ztraceny!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Odpov�zte \"ano\", pokud chcete smazat podkl��"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2105,7 +2110,7 @@ msgstr ""
 "proto�e m��e b�t d�le�it� p�i vytv��en� d�v�ry kl��e nebo jin�ho kl��e\n"
 "ceritifikovan�ho t�mto kl��em."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2117,13 +2122,13 @@ msgstr ""
 "byl pou�it, proto�e tento podpisovac� kl�� m��e vytvo�it d�v�ru\n"
 "prost�ednictv�m jin�ho ji� certifikovan�ho kl��e."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Podpis je neplatn�. Je rozumn� ho odstranit z Va�eho souboru kl���."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2136,7 +2141,7 @@ msgstr ""
 "pou��vat. Ud�lejte to jenom v p��pad�, kdy je tento podpis kl��e\n"
 "j�m sam�m z n�jak�ho d�vodu neplatn� a kdy je k dipozici kl�� jin�."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2146,25 +2151,25 @@ msgstr ""
 "na aktu�ln� seznam p�edvoleb. �asov� raz�tka v�ech dot�en�ch podpis�\n"
 "kl��� jimi samotn�mi budou posunuty o jednu vte�inu dop�edu.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Pros�m, zopakujte posledn� heslo, abyste si byl(a) jist�(�), co jste \n"
 " napsal(a)."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Zadejte n�zev souboru, ke kter�mu se podpis vztahuje"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Pokud si p�ejete p�eps�n� souboru, odpov�zte \"ano\""
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2172,7 +2177,7 @@ msgstr ""
 "Pros�m, vlo�te nov� n�zev souboru. Pokud pouze stisknete RETURN, bude\n"
 "pou�it implicitn� soubor (kter� je uk�z�n v z�vork�ch)."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2200,7 +2205,7 @@ msgstr ""
 "      Toto pou�ijte, pokud by se identifik�tor u�ivatele u� nem�l pou��vat;\n"
 "      norm�ln� se pou��v� k ozna�en� neplatn� e-mailov� adresy.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2210,533 +2215,533 @@ msgstr ""
 "ceritifik�tu. Pros�m, stru�n�. \n"
 "Text kon�� pr�zdn�m ��dkem.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Pomoc nen� k dispozici"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pomoc nen� dostupn� pro '%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "ve�ejn� kl�� neodpov�d� tajn�mu kl��i!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "odstranit nepou�iteln� ��sti z kl��e"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d byl p�esko�en\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kl��e byly doposud zpracov�ny\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkov� po�et zpracovan�ch kl���: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "     p�esko�eny nov� kl��e: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez ID u�ivatele: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 importov�no: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                 beze zm�n: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nov� ID u�ivatel�: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "             nov� podkl��e: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nov� podpisy: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "       nov� revokace kl���: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      p�e�ten� tajn� kl��e: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "   importovan� tajn� kl��e: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "     tajn� kl��e nezm�n�ny: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             neimportov�no: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         odstran�n� podpisy: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " odstran�n� u�ivatelsk� ID: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, fuzzy, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "VAROV�N�: kl�� %s obsahuje preference pro algoritmy,\n"
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "kter� nesjou k dispozici. T�k� se to t�chto user ID:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preference pro �ifrovac� algortimus %s\n"
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": preference pro podepisovac� algoritmus %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": preference pro komprima�n� algoritmus %s\n"
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "velmi doporu�ujeme aktualiaci nastaven� va�ich preferenc� a\n"
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "distribuci tohoto kl��e aby jste p�ede�el probl�m�m s neshodou algoritm�\n"
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "nelze aktualizovat preference s: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kl�� %s: PKS po�kozen� podkl��e opraveno\n"
 
 # c-format
-#: g10/import.c:765
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kl�� %s: p�ijat id u�ivatele \"%s\",kter� nen� podeps�n j�m sam�m\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kl�� %s: chyb� platn� identifik�tor u�ivatele\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "m��e to b�t zp�sobeno chyb�j�c�m podpisem kl��e j�m sam�m\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kl�� %s: ve�ejn� kl�� nenalezen: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kl�� %s: nov� kl�� - p�esko�en\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 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:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kl�� %s: ve�ejn� kl�� \"%s\" importov�n\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kl�� %s: neodpov�d� na�� kopii\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kl�� %s: nemohu naj�t origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kl�� %s: nemohu ��st origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kl�� %s: \"%s\" 1 nov� identifik�tor u�ivatele\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch identifik�tor� u�ivatele\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podpis�\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podkl��\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podkl���\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "kl�� %s: \"%s\" %d ID u�ivatele odstran�no\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "kl�� %s: \"%s\" %d ID u�ivatele odstran�no\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kl�� %s: \"%s\" beze zm�n\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kl�� %s: tajn� kl�� s neplatnou �ifrou %d - p�esko�eno\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "import tajn�ch kl��� nen� povolen\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nen� nastaven implicitn� soubor tajn�ch kl��� %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kl�� %s: tajn� kl�� importov�n\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kl�� %s: je ji� v souboru tajn�ch kl���\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kl�� %s: nenalezen tajn� kl��: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "kl�� %s: chyb� ve�ejn� kl�� - nemohu aplikovat revoka�n� certifik�t\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - zam�tnuto\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kl�� %s: \"%s\" revoka�n� certifik�t importov�n\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kl�� %s: neexistuje id u�ivatele pro podpis\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e u u�ivatelsk�ho id  \"%s"
 "\"\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kl�� %s neplatn� podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kl�� %s: neexistuje podkl�� pro v�z�n� kl���\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kl�� %s: neplatn� vazba podkl��e\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� vazba podkl��e\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kl�� %s: neexistuje podkl�� pro revokaci kl��e\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kl�� %s: neplatn� revoka�n� podkl��\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� revokace podkl��e\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kl�� %s: p�esko�en identifik�tor u�ivatele \"%s\"\n"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kl�� %s: podkl�� p�esko�en\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kl�� %s: podpis nen� exportovateln� (t��da %02X) - p�esko�eno\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kl�� %s: revoka�n� certifik�t na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - p�esko�en\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kl�� %s: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kl�� %s: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kl�� %s: objeven duplikovan� identifik�tor u�ivatele - slou�en\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROV�N�: kl�� %s m��e b�t revokov�n: zkou��m z�skat revoka�n� kl�� %s\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VAROV�N�: kl�� %s m��e b�t revokov�n: revoka�n� kl�� %s nenalezen.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kl�� %s: \"%s\" p�id�n revoka�n� certifik�t\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kl�� %s: podpis kl��e j�m sam�m (direct key signature) p�id�n\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "POZN�MKA: S/N kl��e neodpov�d� S/N karty\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "POZN�MKA: prim�rn� kl�� je online a je ulo�en na kart�\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "POZN�MKA: sekund�rn� kl�� je online a je ulo�en na kart�\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "soubor kl��� (keyring) `%s' vytvo�en\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "zdroj bloku kl��e `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "selhalo obnoven� vyrovn�vac� pam�ti kl���: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revokace]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[podpis kl��e j�m sam�m]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 �patn� podpis\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d �patn�ch podpis�\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neov��en, proto�e chyb� kl��\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpis� neov��en�ch, proto�e chyb� kl��\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neov��en, proto�e vznikla chyba\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis� neov��en�ch, proto�e vznikly chyby\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "objeven 1 identifik�tor u�ivatele bez platn�ho podpisu j�m sam�m\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "objeveno %d identifik�tor� u�ivatele bez platn�ho podpisu j�m sam�m\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2748,17 +2753,17 @@ msgstr ""
 "kontrolou fingerprint� z r�zn�ch zdroj�...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�v��uji ��ste�n�\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�v��uji �pln�\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2768,47 +2773,47 @@ msgstr ""
 "Hloubka v�t�� ne� 1 umo��uje kl���m, kter� jste podepsal\n"
 "podepsat jin� kl��, kter� bude pro V�s d�v�ryhodn�.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Pros�m vlo�te dom�nu, pro kterou je podpis omezen nebo stiskn�te enter pro "
 "podpis bez omezen� na dom�nu.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Jste si jist�(�), �e st�le chcete podepsat tento kl��? (a/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Vypr�ela platnost u�ivatelsk�ho ID \"%s\"."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID u�ivatele \"%s\" nen� podeps�no j�m sam�m."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID u�ivatele \"%s\" je p�ipraveno k podpisu."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "Podepsat? (a/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2817,11 +2822,11 @@ msgstr ""
 "Podpis kl��e \"%s\" j�m sam�m je\n"
 "podpis form�tu PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "P�ejete si jej zm�nit na form�t OpenPGP? (a/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2831,13 +2836,13 @@ msgstr ""
 "vypr�ela.\n"
 "\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Chcete vytvo�it nov� podpis a nahradit j�m ten, jeho� platnost vypr�ela? (a/"
 "N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2847,54 +2852,54 @@ msgstr ""
 "je pouze lok�ln�.\n"
 "\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "P�ejete si jej zm�nit na pln� exportovateln� podpise? (a/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" je ji� lok�ln� podeps�n kl��em %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je ji� podeps�n kl��em %s\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Chcete kl�� p�esto znova podepsat? (a/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nic k podeps�n� kl��em %s\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Platnost kl��e vypr�ela!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnost kl��e vypr�� %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnost Va�eho podpisu vypr�ela ve stejnou dobu? (A/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nem��ete ud�lat OpenPGP podpis kl��e typu PGP 2.x, kdy� jste v --pgp2 m�du.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by zp�sobilo nepou�itelnost kl��e v PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2904,31 +2909,31 @@ msgstr ""
 "pat�� v��e uveden� osob�.\n"
 "Pokud nezn�te odpov��, zadejte \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpov�m.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nijak jsem to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��ste�n� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Velmi pe�liv� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Va� v�b�r? (pro v�ce informac� vlo�te '?'): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2937,76 +2942,76 @@ msgstr ""
 "Jste si jist�(�), �e chcete podepsat tento kl��\n"
 "sv�m kl��em \"%s\" (%s)\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 msgid "This will be a self-signature.\n"
 msgstr "Jedn� se o podpis kl��e j�m sam�m.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "VAROV�N�: podpis nebude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "VAROV�N�: podpis nebude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Podpis bude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "I have not checked this key at all.\n"
 msgstr "Nijak jsem tento kl�� neov��il.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 msgid "I have checked this key casually.\n"
 msgstr "��ste�n� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 msgid "I have checked this key very carefully.\n"
 msgstr "Velmi pe�liv� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 msgid "Really sign? (y/N) "
 msgstr "Skute�n� podepsat? (a/N) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "K dispozici je jen kontroln� sou�et kl��e nebo je kl�� na kart� - passphrase "
 "nelze zm�nit.\n"
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� ��st prim�rn�ho kl��e jsou ulo�eny na kart�.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nen� mo�n� editovat tento kl��: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3014,11 +3019,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3026,186 +3031,186 @@ msgstr ""
 "Nechcete heslo - to *nen�* dobr� n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 msgid "Do you really want to do this? (y/N) "
 msgstr "Opravdu to chcete ud�lat? (a/N) "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "p�esunuji podpis kl��e na spr�vn� m�sto\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "ulo�it a ukon�it"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "vypsat fingerprint kl��e"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "vypsat seznam kl��� a id u�ivatel�"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u�ivatele N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "vyberte podkl�� N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "kontrolovat podpisy"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "podepsat vybran� ID u�ivatele [* n��e jsou uvedeny relevantn� p��kazy]"
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs locally"
 msgstr "podepsat vybran� u�ivatelsk� ID lok�ln�"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a trust signature"
 msgstr "podepsat vybran� u�ivatelsk� ID d�v�ryhodn�m podpisem"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "podepsat vybran� u�ivatelsk� ID nerevokovateln�m podpisem"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "p�idat identifik�tor u�ivatele"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "p�idat fotografick� ID"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 msgid "delete selected user IDs"
 msgstr "smazat vybran� ID u�ivatele"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "add a subkey"
 msgstr "p�idat podkl��y"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr "p�idat kl�� na kartu"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr "p�esunout kl�� na kartu"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr "p�esunout z�lo�n� kl�� na kartu"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 msgid "delete selected subkeys"
 msgstr "smazat vybran� podkl��e"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "p�idat revoka�n� kl��"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 msgid "delete signatures from the selected user IDs"
 msgstr "smazat podpisy z vybran�ch u�ivatelsk�ch ID"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "zm�nit datum expirace pro kl�� nebo vybran� podkl��e"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 msgid "flag the selected user ID as primary"
 msgstr "ozna�it vybran� u�ivatelsk� ID jako prim�rn�"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 msgid "toggle between the secret and public key listings"
 msgstr "p�epnout mezi vypisem seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "vypsat seznam p�edvoleb (pro experty)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam p�edvoleb (podrobn�)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "set preference list for the selected user IDs"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "nastavit URL preferovan�ho server kl��� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "zm�nit heslo"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "zm�nit d�v�ryhodnost vlastn�ka kl��e"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 msgid "revoke signatures on the selected user IDs"
 msgstr "revokovat podpisu na vybran�ch u�ivatelsk�ch ID"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 msgid "revoke selected user IDs"
 msgstr "revokovat vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "revoke key or selected subkeys"
 msgstr "revokovat kl�� nebo vybran� podkl��e"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 msgid "enable key"
 msgstr "nastavit kl�� jako platn� (enable)"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 msgid "disable key"
 msgstr "nastavit kl�� jako neplatn� (disable)"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 msgid "show selected photo IDs"
 msgstr "uk�zat vybran� fotografick� ID"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "chyba p�i �ten� bloku tajn�ho kl��e \"%s\": %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Tajn� kl�� je dostupn�.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, nejd��ve pou�ijte p��kaz \"toggle\" (p�epnout).\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3217,156 +3222,156 @@ msgstr ""
 "podpis\n"
 "  (nrsign) nebo libovolnou jejich kombinac�  (ltsign, tnrsign, atd.).\n"
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "Kl�� revokov�n."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Opravdu podepsat v�echny id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�pov�da: Vyberte id u�ivatele k podeps�n�\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Nezn�m� typ podpisu `%s'\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento p��kaz nen� v m�d� %s dovolen�.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybrat alespo� jeden id u�ivatele.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete smazat posledn� id u�ivatele!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 msgid "Really remove this user ID? (y/N) "
 msgstr "Opravdu odstranit tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 msgid "Really move the primary key? (y/N) "
 msgstr "Opravdu p�esunout prim�rn� kl��? (a/N) "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybrat pr�v� jeden kl��.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr "P��kaz o�ek�v� jm�no souboru jako argument\n"
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nemohu otev��t `%s': %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Chyba p�i �ten� z�lo�n�ho kl��e z `%s': %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybrat alespo� jeden kl��.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Opravdu chcete smazat vybran� kl��e? (a/N) "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Opravdu chcete smazat tento kl��? (a/N) "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Opravdu revokovat v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Opravdu revokovat tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Opravdu chcete revokovat cel� kl��? (a/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Opravdu chcete revokovat vybran� podkl��e? (a/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Opravdu chcete revokovat tento podkl��? (a/N) "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "D�v�ryhodnost vlastn�ka nelze m�nit je-li pou��v�na datab�ze d�v�ry "
 "poskytnut� u�ivatelem\n"
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 msgid "Set preference list to:\n"
 msgstr "Nastavit seznam p�edvoleb:\n"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 msgid "Really update the preferences? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby? (a/N) "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 msgid "Save changes? (y/N) "
 msgstr "Ulo�it zm�ny? (a/N) "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�it bez ulo�en�? (a/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "Kl�� nebyl zm�n�n, tak�e nen� pot�eba jej aktualizovat.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Preferovan� keyserver: "
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3374,71 +3379,71 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "U�ivatelsk� ID form�tu PGP 2.x nem� ��dn� p�edvolby\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "V %s tento kl�� revokoval %s kl��em %s\n"
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento kl�� m��e b�t revokov�n %s kl��em %s "
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 msgid "(sensitive)"
 msgstr "(citliv� informace)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, c-format
 msgid "created: %s"
 msgstr "vytvo�en: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, c-format
 msgid "revoked: %s"
 msgstr "revokov�n: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skon�ila: %s"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon��: %s"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, c-format
 msgid "usage: %s"
 msgstr "pou�it�: %s"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, c-format
 msgid "trust: %s"
 msgstr "d�v�ra: %s"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr "��slo karty: "
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3446,17 +3451,17 @@ msgstr ""
 "Pros�m nezapome�te, �e zobrazovan� �daje o platnosti kl��� nemus�\n"
 "b�t nutn� spr�vn�, dokud znova nespust�te program.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "revokov�n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "platnost skon�ila"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3464,7 +3469,7 @@ msgstr ""
 "VAROV�N�: ��dn� u�ivatelsk� ID nebylo ozna�eno jako prim�rn�.  Tento p��kaz\n"
 "              m��e zp�sobit, �e za prim�rn� bude pova�ov�no jin� user ID.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3473,74 +3478,74 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� fotografick�ho ID m��e v n�kter�ch\n"
 "         verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Jste si jist�, �e jej chcete st�le p�idat? (a/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nem�li by jste p�id�vat fotografick� ID k PGP2 kl��i.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smaz�n %d podpis.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smaz�no %d podpis�.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaz�no.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "neplatn�"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3549,358 +3554,358 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� 'pov��en� revokace' m��e v n�kter�ch\n"
 "          verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nem�li by jste p�id�vat 'pov��en� revokace' k PGP2 kl��i.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "kl�� form�tu PGP 2.x nelze pov��it revokac�\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "kl�� nelze pov��it revokac� j�m sam�m\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento kl�� ji� bykl pov��en revokac�\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "VAROV�N�: ustanoven� kl��e 'pov�en�m revok�torem' je nevratn� operace!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Jste si jist�, �e tento kl�� chcete pov��it revokac�? (a/N) "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Pros�m, odstra�te v�b�r z tajn�ch kl���.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte nejv��e jeden podkl��.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�n�m dobu expirace podkl��e.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu expirace prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem��ete zm�nit dobu platnosti kl��e verze 3\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROV�N�: podepisovac� podkl�� %s nen� k���ov� certifikov�n\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "p�esko�en v3 podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete p�epsat? (a/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podepisovac� notace: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "P�epsat (a/N)? "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje u�ivatelsk� ID s hashem %s\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podkl�� s indexem %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u�ivatele:\"%s\"\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podeps�no va��m kl��em %s v %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Jste si jist�, �e jej chcete st�le revokovat? (a/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvo�it pro tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele: %s:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 msgid " (non-revocable)"
 msgstr " (nerevokovateln�)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revokov�no va��m kl��em %s v %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROV�N�: podpis ID u�ivatele je datov�n %d sekund v budoucnosti\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Kl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podkl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zobrazuji %s fotografick� ID o velikosti %ld pro kl�� %s (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "duplicita p�edvolby `%s'\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro �ifrov�n�\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro vzorkov�n�\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "p��li� mnoho p�edvoleb pro komprimaci\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "neplatn� polo�ka `%s' v �et�zci s p�edvolbami\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "zapisuji podpis kl��e j�m sam�m (direct signature)\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "zapisuji podpis kl��e sebou sam�m\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "zapisuji \"key-binding\" podpis\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�lka kl��e; pou�iji %u bit�\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�lka kl��e zaokrouhlena na %u bit�\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 msgid "Sign"
 msgstr "Podepisov�n�"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 msgid "Encrypt"
 msgstr "�ifrov�n�"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr "Autentizace"
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Pro kl�� %s lze prov�st: "
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr "Aktu�ln� povolen� akce: "
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost podepisovat\n"
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost �ifrovat\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost autentizovat\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Konec\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "P�r DSA kl��� DSA dlouh� %u bit�.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "kl�� %s m��e m�t d�lku v intervalu %u a� %u bit�.\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakou d�lku kl��e si p�ejete? (%u) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "velikost kl��e %s mus� b�t v intervalu %u-%u\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�lka kl��e je %u bit�.\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bit�\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3916,7 +3921,7 @@ msgstr ""
 "      <n>m = doba platnosti kl��e skon�� za n m�s�c�\n"
 "      <n>y = doba platnosti kl��e skon�� za n let\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3932,38 +3937,38 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�� za n m�s�c�\n"
 "      <n>y = doba platnosti podpisu skon�� za n let\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "Kl�� je platn� pro? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� pro? (%s) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 msgid "Key does not expire at all\n"
 msgstr "Platnost kl��e nikdy neskon��\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 msgid "Signature does not expire at all\n"
 msgstr "Platnost podpisu nikdy neskon��\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Platnost kl��e skon�� v %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnost podpisu skon�� v %s\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3971,11 +3976,11 @@ msgstr ""
 "V� syst�m neum� zobrazit data po roce 2038.\n"
 "V ka�d�m p��pad� budou data korektn� zpracov�v�na do roku 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vn� (a/N)? "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3991,44 +3996,44 @@ msgstr ""
 "    \"Magda Prochazkova (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Jm�no a p��jmen�: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "Jm�no nem��e za��nat ��slic�\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jm�no mus� b�t dlouh� alespo� 5 znak�\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Koment��: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment��i\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��v�te znakovou sadu `%s'.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4039,7 +4044,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do pole jm�no nebo koment�� nepi�te, pros�m, e-mailovou adresu.\n"
 
@@ -4054,25 +4059,25 @@ msgstr "Do pole jm�no nebo koment�� nepi�te, pros�m, e-mailovou adresu.\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zm�nit (J)m�no, (K)oment��, (E)-mail nebo (U)kon�it? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zm�nit (J)m�no, (K)oment��, (E)-mail, (P)okra�ovat d�l nebo (U)kon�it "
 "program? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Nejd��v, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4080,12 +4085,12 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4097,7 +4102,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4110,50 +4115,50 @@ msgstr ""
 "pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Vytv��en� kl��e bylo zru�eno.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu do souboru ve�ejn�ch kl��� `%s': %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu do souboru tajn�ch kl��� `%s': %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "ve�ejn� a tajn� kl�� byly vytvo�eny a podeps�ny.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4161,12 +4166,12 @@ msgstr ""
 "Tento kl�� nem��e b�t pou�it� pro �ifrov�n�. K vytvo�en�\n"
 "sekund�rn�ho kl��e pro tento ��el m��ete pou��t p��kaz \"--edit-key\".\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4174,7 +4179,7 @@ msgstr ""
 "kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4182,687 +4187,687 @@ msgstr ""
 "kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZN�MKA: vytvo�en� podkl��e pro kl��e v3 nen� v souladu s OpenPGP\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvo�it? (a/N) "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "ulo�en� kl��e na kartu se nezda�ilo: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: z�loha kl��e z karty ulo�ena do `%s'\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "nikdy     "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Kritick� podepisovac� politika: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Podepisovac� politika: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "Kriticky preferovan� keyserver: "
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Kritick� podepisovac� notace: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Podepisovac� notace: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "soubor kl��� (keyring)"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podkl��e:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr " Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podkl��e:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 msgid "      Key fingerprint ="
 msgstr "      Fingerprint kl��e ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr "      Seriov� ��slo karty ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "p�ejmenov�n� `%s' na `%s' se nezda�ilo: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROV�N�: Existuj� dva soubory s tajn�mi informacemi.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s je beze zm�ny\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s je nov�\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Pros�m, opravte tento mo�n� bezpe�nostn� probl�m\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "cache souboru kl��� `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kl��� ji� ulo�eno v cache (%lu podpis�)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kl��� ulo�eno v cache (%lu podpis�)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: soubor kl��� (keyring) vytvo�en\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "VAROV�N�: volba `%s' pro server kl��� nen� na t�to platform� ��inn�\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Vlo�te ��slo (��sla), 'N' pro dal�� nebo 'Q' pro konec> "
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� protokol serveru kl��� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kl�� \"%s\" nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 msgid "key not found on keyserver\n"
 msgstr "kl�� nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�aduji kl�� %s ze %s server %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�aduji kl�� %s z %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "pos�l�m kl�� %s na %s server %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "pos�l�m kl�� %s na %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 msgid "no keyserver action!\n"
 msgstr "��dn� operace se serverem kl���!\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VAROV�N�: keyserver handler z jin� verze GnuPG (%s)\n"
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr "server kl��� neposlal VERSION\n"
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "�adn� server kl��� nen� zn�m (pou��jte volbu --keyserver)\n"
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "vol�n� extern�ho keyserver nen� v t�to verzi podporov�no\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "protokol serveru kl��� `%s' nen� podporov�n\n"
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "akce `%s' nen� podporov�na v protokolu `%s' serveru kl���\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nepodporuje protokol verze  %d\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 msgid "keyserver timed out\n"
 msgstr "�asov� limit pro server kl��� vypr�el\n"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 msgid "keyserver internal error\n"
 msgstr "intern� chyba serveru kl���\n"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "chyba komunikace se serverem kl���: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nen� ID kl��e: p�esko�eno\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "aktualizuji 1 kl�� z %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "aktualizuji %d kl��� z %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, 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:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s za�ifrovan� kl�� sezen�\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, 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:381
+#: g10/mainproc.c:385
 #, c-format
 msgid "public key is %s\n"
 msgstr "ve�ejn� kl�� je %s\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 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:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, 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:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrov�no %s kl��em, ID %s\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrov�n� ve�ejn�m kl��em selhalo: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrov�no s heslem %lu\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrov�no jedn�m heslem\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "p�edpokl�d�m %s �ifrovan�ch dat\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "de�ifrov�n� o.k.\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 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:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROV�N�: se za�ifrovanou zpr�vou bylo manipulov�no!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrov�n� selhalo: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odes�latel po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� jm�no souboru='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 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:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potla�ena\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, 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:1550
+#: g10/mainproc.c:1554
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpis vytvo�en %s\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, 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:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "Kl�� k dispozici na: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "�PATN� podpis od \"%s\""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�enou platnost� od \"%s\""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[nejist�]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu skon�ila %s\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu skon�� %s\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "bin�rn� form�t"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "textov� form�t"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "nezn�m� form�t"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ov��it podpis: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "toto nen� podpis odd�len� od dokumentu\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 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:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis t��dy 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nemohu vypnout vytv��en� core soubor�: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat `%s' selhal na %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) selhal v %s: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "VAROV�N�: pou��v�m experiment�ln� algoritmus ve�ejn�ho kl��e %s\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "VAROV�N�: pou��v�m experiment�ln� �ifrovac� algoritmus %s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "VAROV�N�: pou��v�m experiment�ln� hashovac� algoritmus %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VAROV�N�: vy��dan� algoritmus %s nen� doporu�en\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pro GnuPG nenalezen\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "V�ce informac� naleznete na adrese http://www.gnupg.cz/faq.html\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�it� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou��v�n� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ijte m�sto n�j \"%s%s\" \n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROV�N�: pou��v�n� p��kaz \"%s\" se nedoporu�uje - nepou��vejte jej\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "Nezakomprimov�no"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 msgid "uncompressed|none"
 msgstr "nezakomprimov�no|nic"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "tato zpr�va nemus� b�t s %s pou�iteln�\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "nejednozna�n� volby `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Soubor `%s' existuje. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 msgid "Overwrite? (y/N) "
 msgstr "P�epsat (a/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nezn�m� p��pona\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Vlo�te nov� n�zev souboru"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "zapisuji do standardn�ho v�stupu\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "p�edpokl�d�m podepsan� data v `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "vytvo�en nov� konfigura�n� soubor `%s'\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, 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"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "adres�� `%s' vytvo�en\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nemohu pracovat s algoritmem ve�ejn�ho kl��e %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROV�N�: potencion�ln� nebezpe�n� symetricky za�ifrov�n kl�� sezen�\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(hlavn� ID kl��e %s)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4873,27 +4878,27 @@ msgstr ""
 "\"%.*s\"\n"
 "Kl�� o d�lce %u bit�, typ %s, ID %s, vytvo�en� %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Opakovat heslo\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Vlo�it heslo\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr "v d�vkov�m re�imu se nelze pt�t na heslo\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Vlo�te heslo: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4902,21 +4907,21 @@ msgstr ""
 "Mus�te zn�t heslo, abyste odemknul(a) tajn� kl�� pro\n"
 "u�ivatele: \"%s\"\n"
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�lka %u bit�, typ %s, kl�� %s, vytvo�en� %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (podkl�� na hlavn�m kl��i ID %s)"
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4930,115 +4935,115 @@ msgstr ""
 "kl��i - velk� obr�zek bude m�t za n�sledek velmi velk� ve�ejn� kl�� !\n"
 "Vhodn� velikost obr�zku je asi 240x288.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Vlo�te jm�no JPEG souboru s fotografick�m ID: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nelze otev��t JPEG soubor `%s': %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Tento JPEG je opravdu velk� (%d bajt�)!\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete pou��t? (a/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' nen� soubor ve form�tu JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Je tato fotografie spr�vn� (a/N/u)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "nelze zobrazit photo ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "D�vod nebyl specifikov�n"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "Kl�� je nahrazen"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "Kl�� byl zkompromitov�n"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "Kl�� se ji� nepou��v�"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "Identifik�tor u�ivatele ji� neplat�"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "d�vod pro revokaci: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "revoka�n� pozn�mka: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMuUsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 msgid "No trust value assigned to:\n"
 msgstr "Nen� p�i�azena ��dn� hodnota d�v�ry:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  alias \"%s\"\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Nakolik d�v��ujete tvrzen�, �e tento kl�� pat�� uveden�mu u�ivateli?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Nev�m nebo ne�eknu\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Ned�v��uji\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = D�v��uji absolutn�\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 msgid "  m = back to the main menu\n"
 msgstr " m = zp�t do hlavn�ho menu\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  s = skip this key\n"
 msgstr " s = p�esko�it tento kl��\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  q = quit\n"
 msgstr " u = ukon�it\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5047,37 +5052,37 @@ msgstr ""
 "Minim�ln� �rove� d�v�ry tohoto kl��e je: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Va�e rozhodnut�? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Opravdu chcete nastavit pro tento kl�� absolutn� d�v�ru? (a/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifik�ty vedouc� k fin�ln�mu d�v�ryhodn�mu kl��i:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: Nic nenazna�uje tomu, �e tento kl�� pat�� uveden�mu u�ivateli\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: Je zde ��ste�n� d�v�ra, �e tento kl�� pat�� uveden�mu uv�ivateli\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 msgid "This key probably belongs to the named user\n"
 msgstr "Tento kl�� pravd�podobn� n�le�� uveden�mu u�ivateli\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Tento kl�� n�le�� n�m (m�me odpov�daj�c� tajn� kl��)\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5088,108 +5093,108 @@ msgstr ""
 "n�sleduj�c� ot�zku odpov�d�t ano\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 msgid "Use this key anyway? (y/N) "
 msgstr "Pou��t p�esto tento kl��? (a/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROV�N�: Je pou�it ned�v�ryhodn� kl��!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VAROV�N�: tento kl�� m��e b�t revokov�n (revoka�n� kl�� nenalezen)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VAROV�N�: Tento kl�� byl revokov�n kl��em s pov��en�m k revokaci!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROV�N�: Tento kl�� byl revokov�n sv�m vlastn�kem!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         To m��e znamenat, �e podpis je pad�lan�.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROV�N�: Tento podkl�� byl revokov�n sv�m vlastn�kem!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Pozn�mka: Tento kl�� byl ozna�en jako neplatn� (disabled).\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Pozn�mka: Skon�ila platnost tohoto kl��e!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VAROV�N�: Tento kl�� nen� certifikov�n d�v�ryhodn�m podpisem!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Nic nenazna�uje tomu, �e tento podpis pat�� vlastn�kovi kl��e.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROV�N�: NEd�v��ujeme tomuto kl��i!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Tento podpis je pravd�podobn� PAD�LAN�.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROV�N�: Tento kl�� nen� certifikov�n dostate�n� d�v�ryhodn�mi podpisy!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nen� jist�, zda tento podpis pat�� vlastn�kovi.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: p�esko�eno: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: p�esko�eno: ve�ejn� kl�� je ji� obsa�en v datab�zi\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Nespecifikoval jste identifik�tor u�ivatele (user ID). M��ete pou��t \"-r\"\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr "Aktu�ln� p��jemci:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5197,168 +5202,168 @@ msgstr ""
 "\n"
 "Napi�te identifik�tor u�ivatele (user ID). Ukon�ete pr�zdn�m ��dkem: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Takov� identifik�tor u�ivatele neexistuje.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "p�esko�eno: ve�ejn� kl�� je u� nastaven podle implicitn�ho adres�ta\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "Ve�ejn� kl�� je neplatn� (disabled).\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "p�esko�eno: ve�ejn� kl�� je ji� nastaven\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nezn�m� implicitn� adres�t \"%s\"\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: p�esko�eno: ve�ejn� kl�� je neplatn� (disabled)\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "��dn� platn� adresy\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "data nebyla ulo�ena; k jejich ulo�en� pou�ijte parametr p��kazu \"--output"
 "\"\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba p�i vytv��en� `%s': %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Podpis odd�len� od dokumentu.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zev datov�ho souboru: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "�tu standardn� vstup ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "chyb� podepsan� data\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonymn� adres�t; zkou��m tajn� kl�� %s ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "o.k., my jsme anonymn� adres�t.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "star� k�dov�n� DEK nen� podporov�no\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifrovac� algoritmus %d%s je nezn�m� nebo je zneplatn�n\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "VAROV�N�: v p�edvolb�ch p��jemce nenalezen �ifrovac� algoritmus %s\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "POZN�MKA: platnost tajn�ho kl��e %s skon�ila %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: kl�� byl revokov�n"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "selhalo vytvo�en� paketu (build_packet): %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Revokov�n:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Toto je citliv� revoka�n� kl��)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvo�it pro tento kl�� pov��en� revoka�n� certifik�t? (a/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "na��zen v�stup do form�tu ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "vytvo�en� podepisovac�ho paketu (make_keysig_packet) selhalo: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Revoka�n� certifik�t vytvo�en.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "pro \"%s\" nebyl nalezen ��dn� revoka�n� kl��\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajn� kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "neexistuje odpov�daj�c� ve�ejn� kl��: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "ve�ejn� kl�� neodpov�d� tajn�mu kl��i!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvo�it pro tento kl�� revoka�n� certifik�t? (a/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "nezn�m� kompresn� algoritmus\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "POZN�MKA: Tento kl�� nen� chr�n�n�!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5377,119 +5382,119 @@ msgstr ""
 "na Va�em po��ta�i m��e ukl�dat data ur�en� k tisku a zp��stupnist je\n"
 "jin�m u�ivatel�m!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "Pros�m vyberte d�vod revokace:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "Zru�it"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravd�podobn� zda chcete vybrat %d)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "M��ete vlo�it dal�� popis. Ukon�ete pr�zdn�m ��dkem:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "D�vod revokace: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 msgid "Is this okay? (y/N) "
 msgstr "Je d�vod revokace vybr�n spr�vn�? (a/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "tajn� ��sti kl��e nejsou dostupn�\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "ochrann� algoritmus %d%s nen� podporov�n\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Neplatn� heslo; pros�m, zkuste to znovu"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VAROV�N�: Objeven slab� kl�� - zm��te, pros�m, znovu heslo.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "generuji _nevhodn�_ 16-ti bitov� kontroln� sou�et pro ochranu soukrom�ho "
 "kl��e\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "vytvo�en slab� kl�� - zkou��m znovu\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "nemohu se vyvarovat slab�ho kl��e pro symetrickou �ifru; operaci jsem zkusil "
 "%d kr�t!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROV�N�: konflikt hashe podpisu ve zpr�v�\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VAROV�N�: podepisovac� podkl�� %s nen� k���ov� certifikov�n\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "VAROV�N�: podepisovac� podkl�� %s m� neplatnou k���ovou certifikaci\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "ve�ejn� kl�� %s je o %lu sekund nov�j�� ne� podpis\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "ve�ejn� kl�� %s je o %lu sekund nov�j�� ne� podpis\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5497,7 +5502,7 @@ msgstr ""
 "kl�� %s byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5505,53 +5510,36 @@ msgstr ""
 "kl�� %s byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "POZN�MKA: podpisov�mu kl��i %s skon�ila platnost %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "p�edpokl�d�m �patn� podpis kl��em %s, proto�e je nastaven nezn�m� kritick� "
 "bit\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "kl�� %s: neexistuje podkl�� pro revokaci podkl��e\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kl�� %s: podkl�� kter� je sv�z�n s podpisem neexistuje\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"notaci (notation) nelze ulo�it ve form�tu v3 podpisu (form�t PGP 2.x)\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "notaci (notation) nelze ulo�it jako v3 podpis kl��e (form�t PGP 2.x)\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VAROV�N�: nelze %%-expandovat notaci (p��li� dlouh�). Pou�ity "
 "neexpandovan�.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "URL politiky nelze ulo�it ve form�tu v3 podpisu (form�t PGP 2.x)\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "nelze ulo�it URL politiky do podpisu v3 kl��em (form�t PGP 2.x)\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5559,7 +5547,7 @@ msgstr ""
 "VAROV�N�: nemohu %%-expandovat URL politiky (p��li� dlouh�). Pou�ity "
 "neexpandovan�.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5568,23 +5556,23 @@ msgstr ""
 "VAROV�N�: nemohu %%-expandovat URL preferovan�ho keyservery (p��li� dlouh�). "
 "Pou�ity neexpandovan�.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytvo�it pouze odd�len� podpis (detach-sign)s kl��i "
 "form�tu PGP-2.x\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5592,52 +5580,52 @@ msgstr ""
 "VAROV�N�: vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et jen �iteln� podpisy s kl��i form�tu PGP-2.x\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�ito �ifrov�n� %s\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "kl�� nen� ozna�en jako nedostate�n� bezpe�n� - nemohu jej pou��t s pad�lan�m "
 "RNG!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "p�esko�en \"%s\": duplikov�n\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "p�esko�en \"%s\": %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "p�esko�eno: tajn� kl�� je u� v datab�zi\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "toto je PGP kl�� vygenerovan� podle algoritmu ElGamal,\n"
 "podpisy vytvo�en� t�mto kl��em nejsou bezpe�n�!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "z�znam d�v�ry %lu, typ %d: z�pis selhal: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5646,331 +5634,331 @@ msgstr ""
 "# Seznam p�id�len�ch hodnot d�v�ry, vytvo�en %s\n"
 "# (Pou�ijte \"gpg --import-ownertrust\" k jeho obnov�)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "chyba v `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "sloupec sch�z�"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "neplatn� fingerprint"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "sch�z� hodnota d�v�ryhosdnosti vlastn�ka"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "chyba p�i �ten� v `%s': %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "datab�ze d�v�ry: synchronizace selhala %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "z�znam v datab�zi d�v�ry %lu: lseek() se nepoda�il: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "z�znam v datab�zi d�v�ry %lu: z�pis se nepoda�il (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "transakce s datab�z� d�v�ry je p��li� dlouh�\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adres�� neexistuje!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "nemohu vytvo�it z�mek pro  `%s'\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "nelze zam��t `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepoda�ilo se vytvo�it z�znam verze: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: vytvo�ena neplatn� datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: datab�ze d�v�ry vytvo�ena\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "POZN�MKA: do trustedb nezle zapisovat\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatn� datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepoda�ilo se vytvo�it hashovac� tabulku: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba p�i aktualizaci z�znamu verze: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba p�i �ten� z�znamu verze: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: chyba p�i z�pisu z�znamu verze: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "datab�ze d�v�ry: procedura lseek() selhala: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "datab�ze d�v�ry: procedura read() (n=%d) selhala: %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nen� soubor datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: z�znam verze s ��slem %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatn� verze souboru %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: chyba p�i �ten� voln�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: chyba p�i z�pisu adres��ov�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulov�n� z�znamu selhalo: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: p�id�n� z�znamu selhalo: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "datab�ze d�v�ry je po�kozena; pros�m spus�te \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nemohu pracovat s ��dky del��mi ne� %d znak�\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "vstupn� ��dek je del�� ne� %d znak�\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' nen� platn� dlouh� keyID\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "kl�� %s: akceptov�n jako d�v�ryhodn� kl��\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "kl�� %s se v datab�zi d�v�ry vyskytuje v�ce ne� jednou\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "kl�� %s: nenalezen ve�ejn� kl�� k d�v�ryhodn�mu kl��i - p�esko�eno\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "kl�� %s ozna�en jako absolutn� d�v�ryhodn�.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "z�znam d�v�ry %lu, typ po�. %d: �ten� selhalo: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "z�znam d�v�ry %lu nen� po�adovan�ho typu %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "nelze pou��t nezn�m� model d�v�ry (%d) - p�edpokl�d�me pou�it� modelu %s\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "poui�it� modelu d�v�ry %s\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 "14 fixn� d�lka na kterou se p�ekl�d� see trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[ revokov�n  ]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[ expirov�n  ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[  nezn�m�   ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[nedefinovan�]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[  ��ste�n�  ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[    pln�    ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[  absolutn� ]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "nedefinov�na"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "��dn�"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "��ste�n�"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "pln�"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "absolutn�"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "nen� nutn� kontrolovat datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�� kontrola datab�ze d�v�ry v %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "nen� nutn� kontrolovat datab�zi d�v�ry s modelem `%s'\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nen� nutn� aktualizovat datab�zi d�v�ry s modelem `%s'\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ve�ejn� kl�� %s nebyl nalezen: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m prove�te --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "kontroluji datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "zpracov�no %d kl��� (%d validit vymaz�no)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "��dn� absolutn� d�v�ryhodn� kl�� nebyl nalezen\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ve�ejn� kl�� k absolutn� d�v�ryhodn�mu kl��i %s nebyl nalezen\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "po�adov�no %d ��ste�n� d�v�ry a %d �pln� d�v�ry, model %s\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5978,12 +5966,12 @@ msgstr ""
 "hloubka: %d  platn�ch: %3d  podepsan�ch: %3d  d�v�ra: %d-, %dq, %dn, %dm, %"
 "df, %du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 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:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5998,306 +5986,320 @@ msgstr ""
 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"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "obecn� chyba"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "nezn�m� typ paketu"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "nezn�m� verze"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "nezn�m� algoritmus ve�ejn�ho kl��e"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "nezn�m� hashovac� algoritmus"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "�patn� ve�ejn� kl��"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "�patn� tajn� kl��"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "�patn� podpis"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "chyba kontroln�ho sou�tu"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "�patn� heslo"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "ve�ejn� kl�� nenalezen"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "nezn�m� �ifrovac� algoritmus"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "nemohu otev��t soubor kl���"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "neplatn� paket"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "neplatn� zp�sob reprezentace v ASCII"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "neexistuje u�ivatel s t�mto id"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "tajn� kl�� nen� dostupn�"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "je pou�it �patn� tajn� kl��"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "nepodporov�no"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "�patn� kl��"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "chyba p�i �ten� souboru"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "chyba p�i z�pisu souboru"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "nezn�m� komprima�n� algoritmus"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "chyba p�i otv�r�n� souboru"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "chyba p�i vytv��en� souboru"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "nespr�vn� heslo"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmus ve�ejn�ho kl��e nen� implementov�n"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "�ifrovac� algoritmus nen� implementov�n"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "nezn�m� t��da podpisu"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "chyba v datab�zi d�v�ry"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "�patn� MPI"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "omezen� zdroj�"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "neplatn� soubor kl���"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "�patn� certifik�t"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "�patn� form�t id u�ivatele"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "chyba p�i zav�r�n� souboru"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "chyba p�i p�ejmenov�n� souboru"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "chyba p�i maz�n� souboru"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "neo�ek�van� data"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "konflikt �asov�ho raz�tka"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "nepou�iteln� algoritmus s ve�ejn�m kl��em"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "soubor existuje"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "slab� kl��"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "neplatn� argument"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "�patn� URI"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "toto URI nen� podporov�no"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "chyba s�t�"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "neza�ifrov�no"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "nezpracov�no"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "nepou�iteln� ve�ejn� kl��"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "nepou�iteln� tajn� kl��"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "chyba serveru kl���"
 
-#: util/errors.c:109
+#: util/errors.c:107
 msgid "canceled"
 msgstr "zru�eno"
 
-#: util/errors.c:110
+#: util/errors.c:108
 msgid "no card"
 msgstr "��dn� karta"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "chyb� podepsan� data\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr "CHYBA: "
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr "VAROV�N�: "
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... toto je chyba v programu (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "nalezena chyba v programu ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "ano"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "aAyY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "ne"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "ukon�it"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "uUqQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr "okey|okey"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr "zru�it|zru�it"
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 msgid "cC"
 msgstr "zZ"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "VAROV�N�: Pou��van� pam� nen� bezpe�n�!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "V�ce informac� naleznete na adrese http://www.gnupg.cz/faq.html\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "prov�st operaci nen� mo�n� bez inicializovan� bezpe�n� pam�ti\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pravd�podobn� jste pro tento �kol pou�ili nespr�vn� program)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "notaci (notation) nelze ulo�it ve form�tu v3 podpisu (form�t PGP 2.x)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "notaci (notation) nelze ulo�it jako v3 podpis kl��e (form�t PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "URL politiky nelze ulo�it ve form�tu v3 podpisu (form�t PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr "nelze ulo�it URL politiky do podpisu v3 kl��em (form�t PGP 2.x)\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA po�aduje pou�it� 160-ti bitov�ho hashovac�ho algoritmu\n"
 
diff --git a/po/da.po b/po/da.po
index 9a14931cd..e06200e51 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -16,90 +16,90 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr ""
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr ""
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ADVARSEL: bruger usikker tilf�ldig-nummer-generator!!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -113,14 +113,14 @@ msgstr ""
 "BENYT IKKE DATA GENERERET AF DETTE PROGRAM!!!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -132,62 +132,62 @@ msgstr ""
 "the OS a chance to collect more entropy! (Kr�ver %d byte mere)\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -195,363 +195,368 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 #, fuzzy
 msgid "key already exists\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "panser: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "ugyldigt panserhoved: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "panserhoved: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr ""
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "panserhoved: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr ""
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "uforventet beskyttelse:"
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "ugyldigt radix64 tegn %02x udeladt\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "for tidlig eof (ingen CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "for tidlig eof (i CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "d�rlig CRC\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC fejl; %06lx - %06lx\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "for tidlig eof (i trailer)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldigt panser: linie l�ngere end %d tegn\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "quoted printable-tegn i panser - m�ske pga. en fejlbeh�ftet MTA\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 #, fuzzy
 msgid "male"
 msgstr "sl�til"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "female"
 msgstr "sl�til"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 #, fuzzy
 msgid "not forced"
 msgstr "ikke bearbejdet"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 #, fuzzy
 msgid "Language preferences: "
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingeraftryk:"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -559,457 +564,457 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "list all available data"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the login name"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 #, fuzzy
 msgid "change the language preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 #, fuzzy
 msgid "generate new keys"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr ""
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Gentag kodes�tning: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr ""
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Slet denne n�gle fra n�gleringen? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr ""
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, fuzzy, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr ""
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "l�ser fra '%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr ""
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr ""
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr ""
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr ""
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 msgid "remove the passphrase from exported subkeys"
 msgstr ""
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "d�rlig hemmelig n�gle"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1017,132 +1022,132 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1152,57 +1157,57 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1222,16 +1227,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1241,7 +1246,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1249,666 +1254,666 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "RSA n�gle kan ikke bruges i denne version\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[bruger ikke fundet]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Slet denne n�gle fra n�gleringen? "
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "tidsstempelkonflikt"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1916,16 +1921,16 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1939,23 +1944,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Svar \"ja\" eller \"nej\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1963,19 +1968,19 @@ msgid ""
 "the given value as an interval."
 msgstr ""
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr ""
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr ""
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1984,11 +1989,11 @@ msgid ""
 "Q  to to quit the key generation."
 msgstr ""
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2029,28 +2034,28 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2058,13 +2063,13 @@ msgid ""
 "a trust connection through another already certified key."
 msgstr ""
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2073,30 +2078,30 @@ msgid ""
 "a second one is available."
 msgstr ""
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Svar \"ja\" hvis det er ok at overskrive filen"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2104,7 +2109,7 @@ msgstr ""
 "Indtast et nyt filnavn. Hvis du bare trykker RETUR vil det\n"
 "forvalgte navn (som er vist i klammer) blive brugt."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2120,536 +2125,536 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Ingen hj�lp tilg�ngelig for `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr ""
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "d�rlig hemmelig n�gle"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "sprang over blok af typen %d\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu n�gler behandlet indtil nu\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlede: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              u�ndrede: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nye bruger-id'er: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nye n�gletilbagekald: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige n�gler u�ndre: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "      nye bruger-id'er: %lu\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "n�gle %08lX: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke lokalisere original n�gleblok: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke l�se original n�gleblok: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, fuzzy, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, fuzzy, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[selv-signatur]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 d�rlig signature\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d d�rlige signaturer\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2657,466 +2662,466 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�gle: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "slet bruger id"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "add a subkey"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "add a revocation key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "enable key"
 msgstr "sl� n�gle til"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "disable key"
 msgstr "sl� n�gle fra"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3124,172 +3129,172 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 #, fuzzy
 msgid "Key is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ukendt signaturklasse"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3297,544 +3302,544 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "ugyldig rustning"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Overskriv (j/N)? "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 #, fuzzy
 msgid "Sign"
 msgstr "sign�r"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 #, fuzzy
 msgid "Encrypt"
 msgstr "krypt�r data"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA n�glepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3844,7 +3849,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3854,52 +3859,52 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
 # virker j automatisk istedetfor y?
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3909,44 +3914,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3957,7 +3962,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -3972,24 +3977,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3997,12 +4002,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4010,7 +4015,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4018,767 +4023,767 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "%s signatur fra: %s\n"
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 #, fuzzy
 msgid "Signature policy: "
 msgstr "%s signatur fra: %s\n"
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr ""
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr ""
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "vis n�gler og signaturer"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "vis n�gler og signaturer"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 #, fuzzy
 msgid "disabled"
 msgstr "sl�fra"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "ukendt cifferalgoritme "
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "krypt�r data"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "Key available at: "
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 #, fuzzy
 msgid "unknown"
 msgstr "ukendt version"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan ikke sl� core-dump fra: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "uimplementeret cifferalgoritme"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ikke bearbejdet"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ikke bearbejdet"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fil `%s' eksisterer. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Overskriv (j/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ukendt suffiks\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Indtast nyt filnavn"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "skriver til stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr ""
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr ""
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�gle-ID %08lX)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4786,29 +4791,29 @@ msgid ""
 "%u-bit %s key, ID %s, created %s%s\n"
 msgstr ""
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr ""
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4817,21 +4822,21 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr ""
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Gentag kodes�tning: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4840,452 +4845,452 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
 # virker j automatisk istedetfor y?
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 #, fuzzy
 msgid "Key is superseded"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 #, fuzzy
 msgid "reason for revocation: "
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr ""
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr ""
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Ingen tillidsv�rdi tildelt til %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Denne n�gle tilh�rer sikkert ejeren\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr ""
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "%08lX: Vi stoler IKKE p� denne n�gle\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = tilbage til hovedmenu\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = afslut\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Dit valg? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr ""
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Denne n�gle tilh�rer sikkert ejeren\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Denne n�gle tilh�rer os\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes.\n"
 msgstr ""
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Brug denne n�gle alligevel? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ADVARSEL: Bruger n�gle uden tillid!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Dette kan betyde at signaturen er forfalsket.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne undern�gle er blevet tilbagekaldt af dens ejer!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 #, fuzzy
 msgid "Note: This key has been disabled.\n"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ADVARSEL: Vi tror IKKE p� denne n�gle!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen er formentlig FORFALSKET.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det er ikke sikkert at signaturen tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Du angav ikke en bruger-id. (du kan bruge \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Ingen s�dan bruger-id.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "udeladt: offentlig n�gle er allerede valgt som standard modtager\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: udelod: offentlign�gle er sl�et fra\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "l�ser stdin ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, fuzzy, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "n�gle %08lX: n�gle er blevet annulleret!\n"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5296,592 +5301,576 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Brug denne n�gle alligevel? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, fuzzy, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "ugyldig kodes�tning"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr ""
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "vis pr�ferencer"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 #, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr ""
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "import�r ejertillidsv�rdierne"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "panser: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "tilf�j n�gle"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "udl�b"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "ukendt version"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "offentlig n�gle ikke fundet"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/verify.c:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5893,309 +5882,309 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "generel fejl"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "ukendt pakketype"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "ukendt version"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "ukendt offentlig n�glealgoritme"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "ukendt sammenfatningsalgoritme"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "d�rlig offentlig n�gle"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "d�rlig hemmelig n�gle"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "d�rlig signatur"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "tjeksumsfejl"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "d�rlig kodes�tning"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "offentlig n�gle ikke fundet"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "ukendt cifferalgoritme "
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "kan ikke �bne n�gleringen"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "ugyldig pakke"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "ugyldig rustning"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "ikke-eksisterende bruger id"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "forkert hemmelig n�gle brugt"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "ikke underst�ttet"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "d�rlig n�gle"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "fill�sningsfejl"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "filskrivningsfejl"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "ukendt kompressionsalgoritme"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "fil�bningsfejl"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "filoprettelsesfejl"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "ugyldig kodes�tning"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "uimplementeret offentlig n�glealgoritme"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "uimplementeret cifferalgoritme"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "ukendt signaturklasse"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "tillidsdatabasefejl"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "d�rlig mpi"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "resursegr�nse"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "ugyldig n�glering"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "ugyldigt certifikat"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "d�rlig bruger-id"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "fillukningsfejl"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "filomd�bningsfejl"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "filsletningsfejl"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "uforventet data"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "tidsstempelkonflikt"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "uanvendelig offentlig n�glealgoritme"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "fil eksisterer"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "svag n�gle"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "ugyldigt argument"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "ugyldig URI"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "ikke-underst�ttet URI"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "netv�rksfejl"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "ikke krypteret"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "ikke bearbejdet"
 
-#: util/errors.c:106
+#: util/errors.c:104
 #, fuzzy
 msgid "unusable public key"
 msgstr "d�rlig offentlig n�gle"
 
-#: util/errors.c:107
+#: util/errors.c:105
 #, fuzzy
 msgid "unusable secret key"
 msgstr "d�rlig hemmelig n�gle"
 
-#: util/errors.c:108
+#: util/errors.c:106
 #, fuzzy
 msgid "keyserver error"
 msgstr "generel fejl"
 
-#: util/errors.c:109
+#: util/errors.c:107
 msgid "canceled"
 msgstr ""
 
-#: util/errors.c:110
+#: util/errors.c:108
 #, fuzzy
 msgid "no card"
 msgstr "ikke krypteret"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "krypt�r data"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... dette er en fejl (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "n"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "afslut"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "aA"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 #, fuzzy
 msgid "WARNING: using insecure memory!\n"
 msgstr "Advarsel: benytter ubeskyttet hukommelse!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operation er ikke mulig uden beskyttet hukommelse indl�st\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 
diff --git a/po/de.po b/po/de.po
index 405083d29..59acfc85a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+0200\n"
 "PO-Revision-Date: 2006-06-28 20:54+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -15,91 +15,91 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "Eine Primzahl mit pbits=%u und qbits=%u kann nicht erzeugt werden\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "Eine Primzahl mit weniger als %d Bits kann nicht erzeugt werden\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "Kein Modul zum sammeln von Entropie vorhanden\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "'%s' kann nicht gesperrt werden: %s\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "es wird auf die Sperre `%s' gewartet...\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Status von '%s' ist nicht feststellbar: %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ist keine normale Datei - sie bleibt unbeachtet\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "Hinweis: 'random_seed'-Datei ist leer\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "WARNUNG: Falsche Größe der 'random_seed'-Datei - sie wird nicht verwendet\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "'%s' ist unlesbar: %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "Hinweis: 'random_seed'-Datei bleibt unverändert\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kann '%s' nicht schreiben: %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kann '%s' nicht schließen: %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -114,7 +114,7 @@ msgstr ""
 "\n"
 
 # translated by wk
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -123,7 +123,7 @@ msgstr ""
 "Zufall wird gesammelt.  Bitte arbeiten Sie an etwas anderem, da\n"
 "so die Qualität der Zufallszahlen erhöht werden kann.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -135,62 +135,62 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte benötigt.)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr "Die Antwort enthält keine öffentliche Schlüssel-Daten\n"
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-Callback meldete Fehler: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr "Karte ist dauerhaft gesperrt!\n"
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft geperrt ist\n"
@@ -198,346 +198,351 @@ msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft geperrt ist\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr "|A|Admin-PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Neue Admin-PIN"
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr "|N|Neue PIN"
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 msgid "error reading application data\n"
 msgstr "Fehler beim Lesen der Anwendungsdaten\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 msgid "error reading fingerprint DO\n"
 msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 msgid "key already exists\n"
 msgstr "Schlüssel existiert bereits\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr "Existierender Schlüssel wird ersetzt werden\n"
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 msgid "generating new key\n"
 msgstr "neue Schlüssel werden erzeugt\n"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "der öffentliche Exponent fehlt oder ist zu groß (mehr als %d Bit)\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 msgid "generating key failed\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)}\n"
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Die Hashmethode %s wird von der Karte nicht unterstützt\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII-Hülle: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "Ungültige ASCII-Hülle"
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "ASCII-Hülle: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "Ungültige Klartextsignatur-Einleitung\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "ASCII-Hülle: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "verschachtelte Klartextunterschriften\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 msgid "unexpected armor: "
 msgstr "Unerwartete ASCII-Hülle: "
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "Ungültige mit Bindestrich \"escapte\" Zeile: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Ungültiges \"radix64\" Zeichen %02x ignoriert\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "vorzeitiges Dateiende (keine Prüfsumme)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "vorzeitiges Dateiende (innerhalb der Prüfsumme)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "Falsch aufgebaute Prüfsumme\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Prüfsummenfehler; %06lx - %06lx\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 msgid "premature eof (in trailer)\n"
 msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine gültigen OpenPGP-Daten gefunden.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ungültige ASCII-Hülle: Zeile ist länger als %d Zeichen\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "\"quoted printable\" Zeichen in der ASCII-Hülle gefunden - möglicherweise\n"
 " war ein fehlerhafter Email-Transporter(\"MTA\") die Ursache\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP Karte Nr. %s erkannt\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr "[nicht gesetzt]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 msgid "male"
 msgstr "männlich"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "female"
 msgstr "weiblich"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "unspecified"
 msgstr "unbestimmt"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "not forced"
 msgstr "nicht zwingend"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr "zwingend"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fehler: Nur reines ASCII ist derzeit erlaubt.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fehler: Das Zeichen \"<\" kann nicht benutzt werden.\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fehler: Doppelte Leerzeichen sind nicht erlaubt.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr "Familienname des Kartenbesitzers:"
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr "Vorname des Kartenbesitzers:"
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 "Fehler: Der zusammengesetzte Name ist zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 msgid "URL to retrieve public key: "
 msgstr "URL um den öffentlichen Schlüssel zu holen: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fehler: URL ist zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr "Logindaten (Kontenname): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Fehler: Logindaten sind zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr "Geheime DO-Daten: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Fehler: Geheime DO-Daten sind zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 msgid "Language preferences: "
 msgstr "Spracheinstellungen"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fehler: Ungültige Länge der Einstellungs-Zeichenfolge.\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fehler: Ungültige Zeichen in der Einstellungs-Zeichenfolge\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Geschlecht: (Männlich (M), Weiblich (F) oder Leerzeichen): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 msgid "Error: invalid response.\n"
 msgstr "Fehler: ungültige Antwort.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 msgid "CA fingerprint: "
 msgstr "CA-Fingerabdruck: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fehler: ungültig geformter Fingerabdruck.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Schlüsseloperation nicht möglich: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 msgid "not an OpenPGP card"
 msgstr "Keine gültige OpenPGP-Karte"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr "Vorhandenen Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "Sicherung des Verschlüsselungsschlüssel außerhalb der Karte erstellen? (J/n) "
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr "Vorhandene Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -548,140 +553,140 @@ msgstr ""
 "   PIN = `%s'     Admin-PIN = `%s'\n"
 "Sie sollten sie mittels des Kommandos --change-pin ändern\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 msgid "Please select the type of key to generate:\n"
 msgstr "Bitte wählen Sie die Art des Schlüssel, der erzeugt werden soll:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 msgid "   (1) Signature key\n"
 msgstr "   (1) Unterschriften-Schlüssel\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Verschlüsselungs-Schlüssel\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentisierungs-Schlüssel\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 msgid "Please select where to store the key:\n"
 msgstr "Wählen Sie den Speicherort für den Schlüssel:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 msgid "unknown key protection algorithm\n"
 msgstr "Unbekanntes Schlüssel-Schutzverfahren\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 msgid "secret parts of key are not available\n"
 msgstr "Geheime Teile des Schlüssels sind nicht vorhanden\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 msgid "secret key already stored on a card\n"
 msgstr "geheimer Schlüssel ist bereits auf einer Karte gespeichert\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "Menü verlassen"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "show admin commands"
 msgstr "Zeige Admin-Kommandos"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "list all available data"
 msgstr "Alle vorhandenen Daten auflisten"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr "Kartenbesitzernamen ändern"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr "Schlüssel-holen-URL ändern"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr "Holen des Schlüssels mittels der URL auf der Karte"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change the login name"
 msgstr "Ändern der Logindaten"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "change the language preferences"
 msgstr "Ändern der Spracheinstellungen"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr "Ändern des Geschlechts des Kartenbesitzers"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "change a CA fingerprint"
 msgstr "Ändern des CA-Fingerabdrucks"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr "Umschalte des \"Signature-force-PIN\"-Schalters"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 msgid "generate new keys"
 msgstr "neue Schlüssel erzeugen"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr "Menü für Ändern oder Entsperren der PIN"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 msgid "Admin-only command\n"
 msgstr "nur-Admin Befehl\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 msgid "Admin commands are allowed\n"
 msgstr "Admin-Befehle sind erlaubt\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-Befehle sind nicht erlaubt\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "Geheimer Schlüssel ist nicht vorhanden"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 "Legen Sie die Karte ein und drücken Sie 'Eingabe'; drücken Sie 'c' um "
 "abzubrechen: "
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "löschen des Schlüsselblocks fehlgeschlagen: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -691,139 +696,139 @@ msgstr ""
 "Seriennummer ein:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 "Drücken Sie 'Eingabe' wenn fertig; oder drücken Sie 'c' um abzubrechen: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr "Geben Sie die neue Admin-PIN ein: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr "Geben Sie die neue PIN ein: "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr "Geben Sie die Admin-PIN ein: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr "Geben Sie die PIN ein: "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 msgid "Repeat this PIN: "
 msgstr "Geben Sie die PIN nochmal ein: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Kommando\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Fehler beim Lesen des Schlüsselblocks: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(es sei denn, Sie geben den Schlüssel mittels Fingerprint an)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "dies kann im Batchmodus ohne \"--yes\" nicht durchgeführt werden\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Diesen Schlüssel aus dem Schlüsselbund löschen? (j/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Dies ist ein privater Schlüssel! - Wirklich löschen? (j/N) "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "löschen des Schlüsselblocks fehlgeschlagen: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "Der \"Ownertrust\" wurde gelöscht\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr ""
 "Es gibt einen privaten Schlüssel zu diesem öffentlichen Schlüssel \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "Verwenden Sie zunächst das Kommando \"--delete-secret-key\", um ihn zu "
 "entfernen.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "Aufgrund des S2K-Modus kann ein symmetrisches ESK Paket nicht benutzt "
 "werden\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "benutze Cipher %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur für RSA-Schlüssel mit maximal 2048 Bit "
 "verschlüsselt werden\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Lesen von '%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "Die IDEA-Verschlüsselung kann nicht mit allen Zielschlüsseln verwendet "
 "werden.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -831,7 +836,7 @@ msgstr ""
 "WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %"
 "s (%d) verletzt die Empfängervoreinstellungen\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -840,167 +845,167 @@ msgstr ""
 "WARNUNG: Erzwungenes Kompressionsverfahren %s (%d) verletzt die "
 "Empfängervoreinstellungen.\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %s (%d) "
 "verletzt die Empfängervoreinstellungen\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s verschlüsselt für: %s\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s verschlüsselte Daten\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschlüsselt %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "Warnung: Botschaft wurde mit einem unsicheren Schlüssel verschlüsselt.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "Problem beim Bearbeiten des verschlüsselten Packets\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "Ausführen von externen Programmen wird nicht unterstützt\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "Ausführen von externen Programmen ist ausgeschaltet, da die Dateirechte "
 "nicht sicher sind\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "Diese Plattform benötigt temporäre Dateien zur Ausführung von externen\n"
 "Programmen\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "Ausführen des Programms `%s' nicht möglich: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "Ausführen der Shell `%s' nicht möglich: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "Fehler beim Aufruf eines externen Programms: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "ungewöhnliches Ende eines externen Programms\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "Externes Programm konnte nicht aufgerufen werden\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "Die Ausgabe des externen Programms konnte nicht gelesen werden: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 "WARNUNG: die temporäre Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "WARNUNG: Temporäres Verzeichnis `%s' kann nicht entfernt werden: %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 msgid "export signatures that are marked as local-only"
 msgstr "Exportiere auch Unterschriften die als nicht exportfähig markiert sind"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "Exportiere Widerrufsschlüssel die als \"sensitiv\" markiert sind"
 
-#: g10/export.c:67
+#: g10/export.c:65
 msgid "remove the passphrase from exported subkeys"
 msgstr "Die Passphrase von exportierten Unterschlüssel entfernen"
 
-#: g10/export.c:69
+#: g10/export.c:67
 msgid "remove unusable parts from key during export"
 msgstr "Unbrauchbare Teile des Schlüssel während des Exports entfernen"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr "Während des Exports soviel wie möglich vom Schlüssel entfernen"
 
-#: g10/export.c:325
+#: g10/export.c:323
 msgid "exporting secret keys not allowed\n"
 msgstr "Exportieren geheimer Schlüssel ist nicht erlaubt\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "Schlüssel %s: ungeschützt - übersprungen\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "Schlüssel %s: PGP 2.x-artiger Schlüssel - übersprungen\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "Schlüssel %s: Schlüsselmaterial ist auf einer Karte - übergangen\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "Entfernen des Schutzes für des Unterschlüssel fehlgeschlagen: %s\n"
 
 # translated by wk
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "WARNUNG: Der geheime Schlüssel %s hat keine einfache SK-Prüfsumme\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1008,127 +1013,127 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "Liste der Schlüssel und ihrer Signaturen"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "list and check key signatures"
 msgstr "Signaturen der Schlüssel auflisten und prüfen"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "Schlüssel signieren"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "Schlüssel nur für diesen Rechner signieren"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder bearbeiten eines Schl."
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "Schlüssel auf einem Schlü.server suchen"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "alle Schlüssel per Schlü.server aktualisieren"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "Schlüssel importieren/kombinieren"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr "den Karten-Status ausgeben"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr "Daten auf einer Karte ändern"
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr "PIN einer Karte ändern"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "Ändern der \"Trust\"-Datenbank"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1138,51 +1143,51 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschlüsseln für NAME"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "vor Überschreiben nachfragen"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr "OpenPGP-Verhalten strikt beachten"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x-kompatibele Botschaften erzeugen"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1191,7 +1196,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollständige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1211,17 +1216,17 @@ msgstr ""
 " --list-keys [Namen]        Schlüssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Berichte über Programmfehler bitte in englisch an <[email protected]>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1231,7 +1236,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1239,73 +1244,73 @@ msgstr ""
 "\n"
 "Unterstützte Verfahren:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "Öff.Schlüssel: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "Verschlü.: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses für Home-"
 "Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1313,20 +1318,20 @@ msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses des Home-"
 "Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1334,569 +1339,569 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf "
 "Erweiterung `%s'\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 msgid "show all notations during signature listings"
 msgstr "Alle Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Der bevorzugten Schlüsselserver mit den Signaturen anlisten"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 msgid "show expiration dates during signature listings"
 msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "Verschlüsselungserweiterung `%s' wurde wegen unsicherer Zugriffsrechte nicht "
 "geladen\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Unterschriftablaufdatum\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen wahrend der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "Die URL für den bevorzugten Schlüsselserver während der Signaturprüfung "
 "anzeigen"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "Alle Notationen wahrend der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfuns-Option.\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige Überprüfuns-Option.\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "HINWEIS: %s ist in dieser Version nicht vorhanden\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie nur abgetrennte oder Klartextunterschriften "
 "machen\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie nicht gleichzeitig unterschreiben und "
 "verschlüsseln\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "Im --pgp2-Modus müssen Sie Dateien benutzen und können keine Pipes "
 "verwenden.\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschlüssen einer Botschaft benötigt im --pgp2-Modus die IDEA-"
 "Verschlüsselung\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ungültiger \"default-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard Voreinstellungen\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Verschlüsselungsverfahren %s ist im %s-Modus nicht "
 "erlaubt.\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WARNUNG: Empfänger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet "
 "werden\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zu viele Einträge im pk-Cache - abgeschaltet\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 msgid "[User ID not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ungültiger Schlüssel %s, gültig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "Kein privater Unterschlüssel zum öffentlichen Unterschlüssel %s - "
 "übergangen\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "der Zweitschlüssel %s wird anstelle des Hauptschlüssels %s verwendet\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 "Schlüssel %08lX: geheimer Schlüssel, aber ohne öffentlichen Schlüssel - "
 "übersprungen\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "Schlüssel aus diesem Schlüsselbund nehmen"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "differierende Zeitangaben sind kein Fehler"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr "Aufruf: gpgv [Optionen] [Dateien] (-h Hilfe)\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1907,7 +1912,7 @@ msgstr ""
 "um das \"Netz des Vertrauens\" aufzubauen.  Dieses hat nichts mit dem\n"
 "(implizit erzeugten) \"Netz der Zertifikate\" zu tun."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1919,19 +1924,19 @@ msgstr ""
 "auf deren geheimen Schlüssel Sie Zugruff haben.\n"
 "Antworten Sie mit \"yes\" um diesen Schlüssel uneingeschränkt zu vertrauen\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Wenn Sie diesen nicht vertrauenswürdigen Schlüssel trotzdem benutzen "
 "wollen,\n"
 "so antworten Sie mit \"ja\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Geben Sie die User-ID dessen ein, dem Sie die Botschaft senden wollen."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1945,7 +1950,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1956,16 +1961,16 @@ msgstr ""
 "Anwendungsgebiten benutzt werden.  Bitte lassen Sie sich zuerst von \n"
 "einem Sicherheistexperten beraten."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Wählen Sie die gewünschte Schlüssellänge"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Geben Sie \"ja\" oder \"nein\" ein"
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1977,21 +1982,21 @@ msgstr ""
 "erhält dann ggfs. keine brauchbaren Fehlermeldungen - stattdessen versucht\n"
 "der Rechner den Wert als Intervall (von-bis) zu deuten."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Geben Sie den Namen des Schlüsselinhabers ein"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 "Geben Sie eine Email-Adresse ein. Dies ist zwar nicht unbedingt notwendig,\n"
 "aber sehr empfehlenswert."
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Geben Sie - bei Bedarf - einen Kommentar ein"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2005,12 +2010,12 @@ msgstr ""
 "F  um mit der Schlüsselerzeugung fortzusetzen.\n"
 "B  um die Schlüsselerzeugung abbrechen."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "Geben Sie \"ja\" (oder nur \"j\") ein, um den Unterschlüssel zu erzeugen."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2083,11 +2088,11 @@ msgstr ""
 "\n"
 "Wenn Sie nicht wissen, wie Sie antworten sollen, wählen Sie \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Geben Sie \"ja\" (oder nur \"j\") ein, um alle User-IDs zu beglaubigen"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2095,12 +2100,12 @@ msgstr ""
 "Geben Sie \"ja\" (oder nur \"j\") ein, um diese User-ID zu LÖSCHEN.\n"
 "Alle Zertifikate werden dann auch weg sein!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 "Geben Sie \"ja\" (oder nur \"j\") ein, um diesen Unterschlüssel zu löschen"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2112,7 +2117,7 @@ msgstr ""
 "Schlüssel\n"
 "herzustellen."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2125,7 +2130,7 @@ msgstr ""
 "sie wissen, welcher Schlüssel verwendet wurde. Denn vielleicht würde genau\n"
 "diese Beglaubigung den \"Trust\"-Weg komplettieren."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2133,7 +2138,7 @@ msgstr ""
 "Diese Beglaubigung ist ungültig. Es ist sinnvoll sie aus Ihrem\n"
 "Schlüsselbund zu entfernen."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2149,7 +2154,7 @@ msgstr ""
 "irgendeinem Grund nicht gültig ist und eine zweite Beglaubigung verfügbar "
 "ist."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2160,27 +2165,27 @@ msgstr ""
 "betroffenen\n"
 "Eigenbeglaubigungen werden um eine Sekunde vorgestellt.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Bitte geben Sie die Passphrase ein. Dies ist ein geheimer Satz \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Um sicher zu gehen, daß Sie sich bei der Eingabe der Passphrase nicht\n"
 "vertippt haben, geben Sie diese bitte nochmal ein.  Nur wenn beide Eingaben\n"
 "übereinstimmen, wird die Passphrase akzeptiert."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 "Geben Sie den Namen der Datei an, zu dem die abgetrennte Unterschrift gehört"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Geben Sie \"ja\" ein, wenn Sie die Datei überschreiben möchten"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2189,7 +2194,7 @@ msgstr ""
 "Eingabetaste betätigen, wird der (in Klammern angezeigte) Standarddateiname\n"
 "verwendet."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2217,7 +2222,7 @@ msgstr ""
 "      Um bekanntzugeben, daß die User-ID nicht mehr benutzt werden soll.\n"
 "      So weist man normalerweise auf eine ungültige Emailadresse hin.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2227,550 +2232,550 @@ msgstr ""
 "Sie diesen Widerruf herausgeben.  Der Text sollte möglichst knapp sein.\n"
 "Eine Leerzeile beendet die Eingabe.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Keine Hilfe vorhanden."
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe für '%s' vorhanden."
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "Ändern der \"Trust\"-Datenbank"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "Öffentliche Schlüssel paßt nicht zum geheimen Schlüssel!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "unbrauchbarer geheimer Schlüssel"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "überspringe den Block vom Typ %d\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu Schlüssel bislang bearbeitet\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "              ignorierte neue Schlüssel: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                           ohne User-ID: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "                             importiert: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                            unverändert: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                          neue User-IDs: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                    neue Unterschlüssel: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                        neue Signaturen: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "                neue Schlüsselwiderrufe: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "             gelesene geheime Schlüssel: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "           geheime Schlüssel importiert: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "                 unveränderte geh.Schl.: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                       nicht importiert: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "                        neue Signaturen: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "             gelesene geheime Schlüssel: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "WARNING: Schlüssel %s hat Einstellungen zu nicht verfügbaren\n"
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "         Algorithmen für diese User IDs:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, fuzzy, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "Schlüssel %s: Keine User-ID\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "Schlüssel %s: PKS Unterschlüsseldefekt repariert\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "Schlüssel %s: Nicht eigenbeglaubigte User-ID `%s' übernommen\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "Schlüssel %08lX: Keine gültigen User-IDs\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dies könnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "Schlüssel %08lX: Öffentlicher Schlüssel nicht gefunden: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "Schlüssel %08lX: neuer Schlüssel - übersprungen\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "Schlüssel %08lX: Öffentlicher Schlüssel \"%s\" importiert\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "Schlüssel %08lX: Stimmt nicht mit unserer Kopie überein\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 "Schlüssel %08lX: der lokale originale Schlüsselblocks wurde nicht gefunden: %"
 "s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 "Schlüssel %08lX: Lesefehler im lokalen originalen Schlüsselblocks: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "Schlüssel %08lX: \"%s\" 1 neue User-ID\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "Schlüssel %08lX: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "Schlüssel %08lX: \"%s\" 1 neue Signatur\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "Schlüssel %08lX: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "Schlüssel %08lX: \"%s\" 1 neuer Unterschlüssel\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "Schlüssel %08lX: \"%s\" %d neue Unterschlüssel\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "Schlüssel %08lX: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "Schlüssel %08lX: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "Schlüssel %08lX: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "Schlüssel %08lX: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "Schlüssel %08lX: \"%s\" Nicht geändert\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "Schlüssel %08lX: geheimer Schlüssel mit ungültiger Verschlüsselung %d - "
 "übersprungen\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Kein voreingestellter geheimer Schlüsselbund: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Schlüssel %08lX: Geheimer Schlüssel importiert\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "Schlüssel %08lX: Ist bereits im geheimen Schlüsselbund\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "Schlüssel %08lX: geheimer Schlüssel nicht gefunden: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "Schlüssel %08lX: Kein öffentlicher Schlüssel - der Schlüsselwiderruf kann "
 "nicht angebracht werden\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Schlüssel %08lX: Ungültiges Widerrufzertifikat: %s - zurückgewiesen\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Schlüssel %08lX: \"%s\" Widerrufzertifikat importiert\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "Schlüssel %08lX: Keine User-ID für Signatur\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "Schlüssel %08lX: Nicht unterstütztes Public-Key-Verfahren für User-ID \"%s"
 "\"\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "Schlüssel %08lX: Ungültige Eigenbeglaubigung für User-ID \"%s\"\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 "Schlüssel %08lX: Kein Unterschlüssel für die Unterschlüsselanbindungs-"
 "Beglaubigung\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "Schlüssel %08lX: Nicht unterstütztes Public-Key-Verfahren\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "Schlüssel %08lX: Ungültige Unterschlüssel-Anbindung\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "Schlüssel %08lX: Ungültige Unterschlüssel-Anbindung entfernt\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 "Schlüssel %08lX: Kein Unterschlüssel für die Unterschlüsselwiderruf-"
 "Beglaubigung\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "Schlüssel %08lX: Ungültiger Unterschlüsselwiderruf\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 "Schlüssel %08lX: Mehrfacher Unterschlüssel-Widerruf-Beglaubigung entfernt\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "Schlüssel %08lX: User-ID übergangen '"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "Schlüssel %08lX: Unterschlüssel ignoriert\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "Schlüssel %08lX: Nicht exportfähige Unterschrift (Klasse %02x) - übergangen\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "Schlüssel %08lX: Widerrufzertifikat an falschem Platz - übergangen\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Schlüssel %08lX: Ungültiges Widerrufzertifikat: %s - übergangen\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "Schlüssel %08lX: Widerrufzertifikat an falschem Platz - übergangen\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "Schlüssel %08lX: unerwartete Unterschriftenklasse (0x%02x) - übergangen\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "Schlüssel %08lX: Doppelte User-ID entdeckt - zusammengeführt\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "WARNUNG: Schlüssel %08lX ist u.U. widerrufen: hole Widerrufschlüssel %08lX\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "WARNUNG: Schlüssel %08lX ist u.U. widerrufen: Widerrufschlüssel %08lX ist "
 "nicht vorhanden\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "Schlüssel %08lX: \"%s\" Widerrufzertifikat hinzugefügt\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "Schlüssel %08lX: \"direct-key\"-Signaturen hinzugefügt\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "Öffentliche Schlüssel paßt nicht zum geheimen Schlüssel!\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "Fehler beim Erzeugen des Schlüsselbundes `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "Schlüsselbund `%s' erstellt\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "Fehler beim Erstellen von `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Schlüsselbund-Cache konnte nicht neu erzeugt werden: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[Widerruf]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 falsche Beglaubigung\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d falsche Beglaubigungen\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 Beglaubigung wegen fehlendem Schlüssel nicht geprüft\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d Beglaubigungen wegen fehlenden Schlüsseln nicht geprüft\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 Beglaubigung aufgrund von Fehler nicht geprüft\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d Beglaubigungen aufgrund von Fehlern nicht geprüft\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Eine User-ID ohne gültige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d User-IDs ohne gültige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2784,17 +2789,17 @@ msgstr ""
 "unterschiedlichen Quellen ...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Ich vertraue ihm marginal\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Ich vertraue ihm vollständig\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2804,48 +2809,48 @@ msgstr ""
 "Eine Tiefe größer 1 erlaubt dem zu unterschreibenden Schlüssel\n"
 "Trust-Signatures für Sie zu machen.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Geben Sie bitte eine Domain ein, um die Unterschrift einzuschränken,\n"
 "oder nur die Eingabetaste für keine Domain\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User-ID \"%s\" ist widerrufen."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immer noch beglaubigen? (j/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht möglich.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User-ID \"%s\" ist abgelaufen."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2854,11 +2859,11 @@ msgstr ""
 "Die Eigenbeglaubigung von \"%s\"\n"
 "ist eine PGP 2.x artige Signatur.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung geändert werden? (j/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2867,13 +2872,13 @@ msgstr ""
 "Ihre derzeitige Beglaubigung von \"%s\"\n"
 "ist abgelaufen.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Soll eine neue Beglaubigung als Ersatz für die abgelaufene erstellt werden? "
 "(J/n) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2882,44 +2887,44 @@ msgstr ""
 "Die derzeitige Beglaubigung von \"%s\"\n"
 "ist nur für diesen Rechner gültig.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" wurde bereits durch Schlüssel %08lX lokal beglaubigt\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" wurde bereits durch Schlüssel %08lX beglaubigt\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Wollen Sie ihn immer noch wieder beglaubigen? (j/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nichts zu beglaubigen für Schlüssel %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Dieser Schlüssel ist verfallen!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Dieser Schlüssel wird %s verfallen.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (J/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2927,11 +2932,11 @@ msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schlüsseln unterschrieben "
 "werden\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Dies würde den Schlüssel für PGP 2.x unbrauchbar machen\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2941,33 +2946,33 @@ msgstr ""
 "wollen, wirklich der o.g. Person gehört?\n"
 "Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ich antworte nicht.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ich habe es überhaupt nicht überprüft.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ich habe es flüchtig überprüft.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ich habe es sehr sorgfältig überprüft.%s\n"
 
 # translated by wk
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ihre Auswahl? ('?' für weitere Informationen): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2976,14 +2981,14 @@ msgstr ""
 "Sind Sie wirklich sicher, daß Sie vorstehenden Schlüssel mit Ihrem\n"
 "Schlüssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Dies wird eine Eigenbeglaubigung sein.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
@@ -2991,85 +2996,85 @@ msgstr ""
 "WARNUNG: Die Unterschrift wird nicht als nicht-exportierbar markiert "
 "werden.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Die Unterschrift wird nicht als nicht-widerrufbar markiert werden.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportfähig markiert werden.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportfähig markiert werden.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Ich habe diesen Schlüssel überhaupt nicht überprüft.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ich habe diesen Schlüssel flüchtig überprüft.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ich habe diesen Schlüssel sehr sorgfältig überprüft.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 msgid "Really sign? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Dieser Schlüssel ist nicht geschützt.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschlüssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Geheime Teile des Haupschlüssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "Schlüssel ist geschützt.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schlüssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3077,11 +3082,11 @@ msgstr ""
 "Geben Sie die neue Passphrase für diesen geheimen Schlüssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3089,209 +3094,209 @@ msgstr ""
 "Sie wollen keine Passphrase - dies ist *nicht* zu empfehlen!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Möchten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "speichern und Menü verlassen"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "Schlüssel und User-IDs auflisten"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "User-ID N auswählen"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "User-ID N auswählen"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "Den Schlüssel nur für diesen Rechner beglaubigen"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Tip: Wählen Sie die User-IDs, die beglaubigt werden sollen\n"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "Eine User-ID hinzufügen"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "Eine Foto-ID hinzufügen"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "User-ID entfernen"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "Einen Zweitschlüssel entfernen"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "Einen Widerrufschlüssel hinzufügen"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Möchten Sie die Voreinstellungen der ausgewählten User-IDs wirklich ändern? "
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "Umschalten zwischen Anzeige geheimer und öffentlicher Schlüssel"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "Liste der Voreinstellungen (für Experten)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "Liste der Voreinstellungen (ausführlich)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Möchten Sie die Voreinstellungen der ausgewählten User-IDs wirklich ändern? "
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "Schlüsselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Möchten Sie die Voreinstellungen der ausgewählten User-IDs wirklich ändern? "
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "Die Passphrase ändern"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" ändern"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Möchten Sie wirklich alle ausgewählten User-IDs widerrufen? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "Eine User-ID widerrufen"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "Einen Zweitschlüssel widerrufen"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "enable key"
 msgstr "Schlüssel anschalten"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "disable key"
 msgstr "Schlüssel abschalten"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "Foto-ID anzeigen"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Fehler beim Lesen des geheimen Schlüsselblocks `%s': %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schlüssel ist vorhanden.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schlüssel benötigt.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zunächst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3299,236 +3304,236 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "Schlüssel wurde widerrufen."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tip: Wählen Sie die User-IDs, die beglaubigt werden sollen\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Unbekannter Unterschriftentyp `%s'\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Dieses Kommando ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gelöscht werden!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Möchten Sie alle ausgewählten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Fehler beim Erzeugen des Schlüsselbundes `%s': %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Möchten Sie diesen Schlüssel wirklich entfernen? "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Möchten Sie wirklich alle ausgewählten User-IDs widerrufen? "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Diese User-ID wirklich widerrufen? "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Möchten Sie diesen Schlüssel wirklich vollständig widerrufen? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Möchten Sie diesen Schlüssel wirklich widerrufen? "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Möchten Sie die Voreinstellungen der ausgewählten User-IDs wirklich ändern? "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Die Voreinstellungen wirklich ändern? "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 msgid "Save changes? (y/N) "
 msgstr "Änderungen speichern? "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 msgid "Quit without saving? (y/N) "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Änderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Änderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Eigenschaften: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr "\"Notation\": "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-artige Schlüssel haben keine Voreinstellungen.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Dieser Schlüssel könnte widerrufen worden sein von %s Schlüssel "
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Dieser Schlüssel könnte widerrufen worden sein von %s Schlüssel "
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [verfällt: %s]"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [verfällt: %s]"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr "Gültigkeit: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3536,20 +3541,20 @@ msgstr ""
 "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
 # translated by wk
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3557,7 +3562,7 @@ msgstr ""
 "WARNUNG: Keine User-ID ist als primär markiert.  Dieses Kommando kann\n"
 "dazu führen, daß eine andere User-ID as primär angesehen wird.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3567,74 +3572,74 @@ msgstr ""
 "könnte\n"
 "         bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immer noch hinzufügen? (j/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Sie können einem PGP2-artigen SchlüÂüsel keine Foto-ID hinzufügen.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "ungültig"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User-ID \"%s\" ist widerrufen."
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "User-ID \"%s\" ist widerrufen."
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "User-ID \"%s\" ist widerrufen."
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3644,37 +3649,37 @@ msgstr ""
 "         Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n"
 "         des Schlüssels führen.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Sie können einem PGP2-artigen SchlüÂüsel keine vorgesehenen Widerrufer "
 "hinzufügen.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "Ein PGP 2.x-artiger Schlüssel kann nicht als vorgesehener Widerrufer "
 "eingetragen werden\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Ein Schlüssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "Dieser Schlüssel wurde bereits als ein Widerrufer vorgesehen\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "WARNUNG: Einen Schlüssel als vorgesehenen Widerrufer zu deklarieren, kann "
 "nicht rückgangig gemacht werden!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3682,340 +3687,340 @@ msgstr ""
 "Möchten Sie diesen Schlüssel wirklich als vorgesehenen Widerrufer "
 "deklarieren? (j/N): "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schlüsseln.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bitte wählen Sie höchstens einen Zweitschlüssel aus.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändern des Verfallsdatums des Zweitschlüssels.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "WARNUNG: Signaturunterschlüssel %08lX hat keine Rücksignatur\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID auswählen.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Überspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Beglaubigungs-\"Notation\": "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Überschreiben (j/N)? "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   beglaubigt durch %08lX um %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat für diese Unterschrift erzeugen (j/N)"
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "WARNUNG: Eine User-ID-Unterschrift datiert mit %d Sekunden aus der Zukunft\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Anzeigen einer %s Photo ID (%ld Byte) für Schlüssel %08lX (User-ID %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "Voreinstellung %c%lu ist doppelt\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "zu viele Hashvoreinstellungen\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "zu viele Hashvoreinstellungen\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "zu viele Komprimierungsvoreinstellungen\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Ungültiges Feld in der Voreinstellungszeichenkette\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ungültig Schlüssellänge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 #, fuzzy
 msgid "Encrypt"
 msgstr "Daten verschlüsseln"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 #, fuzzy
 msgid "Authenticate"
 msgstr "uneingeschränkt"
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 #, fuzzy
 msgid "Current allowed actions: "
 msgstr "Derzeitige Voreinstellungenliste:\n"
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (nur verschlüsseln)\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Bitte wählen Sie, welche Art von Schlüssel Sie möchten:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA und ElGamal (voreingestellt)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur verschlüsseln)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschlüsseln)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur verschlüsseln)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur verschlüsseln)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Das DSA-Schlüsselpaar wird 1024 Bit haben.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Welche Schlüssellänge wünschen Sie? (1024) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4031,7 +4036,7 @@ msgstr ""
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4047,38 +4052,38 @@ msgstr ""
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Wie lange bleibt die Beglaubigung gültig? (0) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "Ungültiger Wert.\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 msgid "Key does not expire at all\n"
 msgstr "Schlüssel verfällt nie\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 msgid "Signature does not expire at all\n"
 msgstr "Signature verfällt nie\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key verfällt am %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Unterschrift verfällt am %s\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4086,11 +4091,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 msgid "Is this correct? (y/N) "
 msgstr "Ist dies richtig? (j/N) "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 #, fuzzy
 msgid ""
 "\n"
@@ -4107,44 +4112,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Ungültiges Zeichen im Namen\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "Email-Adresse: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Diese Email-Adresse ist ungültig\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Ungültiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4155,7 +4160,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
 
@@ -4170,23 +4175,23 @@ msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (B)eenden? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4194,12 +4199,12 @@ msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4212,7 +4217,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4223,50 +4228,50 @@ msgstr ""
 "unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
 "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Schlüsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kein schreibbarer geheimer Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4276,12 +4281,12 @@ msgstr ""
 "werden kann.  Sie können aber mit dem Befehl \"--edit-key\" einen\n"
 "Zweitschlüssel für diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4289,7 +4294,7 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4297,704 +4302,704 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HINWEIS: Unterschlüssel für v3-Schlüssen sind nicht OpenPGP-konform\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Wirklich erzeugen? "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "löschen des Schlüsselblocks fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "Hinweis: geheimer Schlüssel %08lX verfällt am %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "niemals   "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Krititische Beglaubigungsrichtlinie: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Beglaubigungsrichtlinie: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Krititische Beglaubigungs-\"Notation\": "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Beglaubigungs-\"Notation\": "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Schlüsselbund"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "Unter-Fingerabdruck  ="
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr " Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr " Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 msgid "      Key fingerprint ="
 msgstr "  Schl.-Fingerabdruck ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr "      Kartenseriennr. ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ist der Unveränderte\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ist der Neue\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "Prüfen des Schlüsselbundes `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu Schlüssel bislang geprüft (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu Schlüssel geprüft (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schlüsselbund erstellt\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "WARNUNG: Optionen in `%s' sind während dieses Laufes noch nicht wirksam\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "Ungültige export Option\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "Schlüssel `%s' nicht gefunden: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "Schlüssel `%s' nicht gefunden: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "Schlüssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Schlüssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schlüssel %08lX um %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "Ungültige export Option\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n"
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "Schlüsselserverfehler"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "Schlüsselserverfehler"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: Dies ist keine gültige Schlüssel-ID\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "WARNUNG: die temporäre Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Schlüssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Schlüssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "WARNUNG: die temporäre Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 "WARNUNG: die temporäre Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, 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:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s verschlüsselter Sitzungsschlüssel\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Passphrase wurde mit unbekanntem Hashverfahren %d erstellt\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, c-format
 msgid "public key is %s\n"
 msgstr "Öffentlicher Schlüssel ist %s\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit öffentlichem Schlüssel verschlüsselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, 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:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %s\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschlüsselung mit Public-Key-Verfahren fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Verschlüsselt mit %lu Passphrases\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "Verschlüsselt mit einer Passphrase\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "vermutlich %s-verschlüsselte Daten\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "Entschlüsselung erfolgreich\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 "WARNUNG: Botschaft wurde nicht integritätsgeschützt (integrity protected)\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschlüsselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Entschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Ursprünglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-Überprüfung unterdrückt\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "diese Mehrfachunterschriften können nicht behandelt werden\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, 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:1555
+#: g10/mainproc.c:1559
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Unterschrift vom %.*s, %s Schlüssel ID %08lX\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "Schlüssel erhältlich bei: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verfallene Unterschrift von \""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[ungewiß]  "
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Unterschrift verfällt am %s.\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "Binäre"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht geprüft werden: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 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:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ungültiges root-Paket in proc_tree() entdeckt\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "Änderung der \"Trust-DB\" fehlgeschlagen: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "Verschlüsselungsverfahren ist nicht implementiert"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "Erzwingen des Hashverfahrens %s (%d) verletzt die Empfängervoreinstellungen\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "das IDEA-Verschlüsselungs-Plugin ist nicht vorhanden\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = Bitte weitere Information anzeigen\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: mißbilligte Option \"%s\".\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "nicht komprimiert"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 msgid "uncompressed|none"
 msgstr "unkomprimiert|kein|keine"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Diese Botschaft könnte für %s unbrauchbar sein\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "Unbekannter voreingestellter Empfänger '%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Datei '%s' existiert bereits. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 msgid "Overwrite? (y/N) "
 msgstr "Überschreiben (j/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: unbekannte Dateinamenerweiterung\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Neuen Dateinamen eingeben"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "Schreiben auf die Standardausgabe\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "Neue Konfigurationsdatei `%s' erstellt\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "WARNUNG: Optionen in `%s' sind während dieses Laufes noch nicht wirksam\n"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "WARNUNG: Möglicherweise unsicherer symmetrisch verschlüsselter "
 "Sitzungsschlüssel\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterstützt\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 "Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (Hauptschlüssel-ID %08lX)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5005,28 +5010,28 @@ msgstr ""
 "Benutzer: \"%.*s\"\n"
 "%u-bit %s Schlüssel, ID %s, erzeugt %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Geben Sie die Passphrase nochmal ein\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Geben Sie die Passphrase ein\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Geben Sie die Passphrase ein: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5036,22 +5041,22 @@ msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-Bit %s Schlüssel, ID %08lX, erzeugt %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Geben Sie die Passphrase nochmal ein: "
 
 # translated by wk
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5066,168 +5071,168 @@ msgstr ""
 "wir Ihr Schlüssel leider auch sehr groß werden.  Ein Bild der GröÂße\n"
 "240x288 Pixel ist eine gute Wahl.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Dateiname mit JPEG für die Photo ID eingeben: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Datei kann nicht geöffnet werden: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' ist keine JPEG Datei\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Ist dieses Bild richtig? (j/N) "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "Die Photo ID kann nicht angezeigt werden!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "Kein Grund angegeben"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "Schlüssel ist überholt"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "Hinweis: Dieser Schlüssel ist nicht mehr sicher"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "Schlüssel wird nicht mehr benutzt"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "User-ID ist nicht mehr gültig"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "Grund für Widerruf: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "Widerruf-Bemerkung: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Es ist kein \"trust value\" zugewiesen für:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                    alias \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Dieser Schlüssel gehört wahrscheinlich dem angegebenen Besitzer\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Weiß nicht so recht\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Nein, ihm traue ich NICHT\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Ich vertraue ihm absolut\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = Zurück zum Menü\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = diesen Schlüssel überSpringen\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = verlassen\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr "Die minimale Trust-Ebene für diesen Schlüssel beträgt: %s\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Ihre Auswahl? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Möchten Sie diesem Schlüssel wirklich uneingeschränkt vertrauen? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Zertifikate führen zu einem letztlich vertrauenswürdigen Schlüssel:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Es gibt keine Garantie, daß dieser Schlüssel wirklich dem angegebenen "
 "Besitzer gehört.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Es gibt nur eine beschränkte Garantie, daß dieser Schlüssel wirklich "
 "dem angegebenen Besitzer gehört.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Dieser Schlüssel gehört wahrscheinlich dem angegebenen Besitzer\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr ""
 "Dieser Schlüssel gehört uns (da wir nämlich den geheimen Schlüssel dazu "
 "haben)\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5238,118 +5243,118 @@ msgstr ""
 "Wenn Sie *wirklich* wissen, was Sie tun, können Sie die nächste\n"
 "Frage mit ja beantworten\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Diesen Schlüssel trotzdem benutzen? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNUNG: Ein Schlüssel ohne gesichertes Vertrauen wird benutzt!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "WARNUNG: Dieser schlüssel ist u.U. widerrufen: Widerrufschlüssel ist nicht "
 "vorhanden\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "WARNUNG: Dieser Schlüssel wurde vom vorgesehen Widerrufer widerrufen!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Schlüssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Das könnte bedeuten, daß die Signatur gefälscht ist.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Unterschlüssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Hinweis: Dieser Schlüssel wurde abgeschaltet.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Hinweis: Dieser Schlüssel ist verfallen!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNUNG: Dieser Schlüssel trägt keine vertrauenswürdige Signatur!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Es gibt keinen Hinweis, daß die Signatur wirklich dem vorgeblichen "
 "Besitzer gehört.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schlüssel!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Die Signatur ist wahrscheinlich eine FÄLSCHUNG.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNUNG: Dieser Schlüssel ist nicht durch hinreichend vertrauenswürdige "
 "Signaturen zertifiziert!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Es ist nicht sicher, daß die Signatur wirklich dem vorgeblichen "
 "Besitzer gehört.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: übersprungen: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Sie haben keine User-ID angegeben (Sie können die Option \"-r\" verwenden).\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 #, fuzzy
 msgid "Current recipients:\n"
 msgstr "Derzeitige Voreinstellungenliste:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5357,171 +5362,171 @@ msgstr ""
 "\n"
 "Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "übersprungen: öffentlicher Schlüssel bereits als Standardempfänger gesetzt\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "übersprungen: öffentlicher Schlüssel bereits gesetzt\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "Unbekannter voreingestellter Empfänger '%s'\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "Keine gültigen Adressaten\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Daten wurden nicht gespeichert; verwenden Sie dafür die Option \"--output\"\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fehler beim Erstellen von `%s': %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Abgetrennte Beglaubigungen.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "keine unterschriebene Daten\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht öffnen.\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "Ungenannter Empfänger; Versuch mit geheimen Schlüssel %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Alles klar, wir sind der ungenannte Empfänger.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "alte Kodierung des DEK wird nicht unterstützt\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "Verschüsselungsverfahren %d%s ist unbekannt oder abgeschaltet\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "Hinweis: Verfahren %d ist kein bevorzugtes Verschlüsselungsverfahren\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "Hinweis: geheimer Schlüssel %08lX verfällt am %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "Hinweis: Schlüssel wurde widerrufen"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "\"build_packet\" fehlgeschlagen: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "Schlüssel %08lX: Keine User-ID\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Schlüssel soll widerrufen werden von:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Dies ist ein \"sensitiver\" Widerrufsschlüssel)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Ein Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "Ausgabe mit ASCII Hülle erzwungen\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "\"make_keysig_packet\" fehlgeschlagen: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Widerrufzertifikat erzeugt.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "Widerrufsschlüssel für `%s' nicht gefunden\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "Geheimer Schlüssel `%s' nicht gefunden: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "kein zugehöriger öffentlicher Schlüssel: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "Öffentliche Schlüssel paßt nicht zum geheimen Schlüssel!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Ein Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "Unbekanntes Schutzverfahren\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "Dieser Schlüssel ist nicht geschützt.\n"
 
 # translated by wk
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5541,127 +5546,127 @@ msgstr ""
 "Drucksystem kann unter Umständen eine Kopie anderen Nutzern zugänglich\n"
 "machen.\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "Grund für den Widerruf:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Wahrscheinlich möchten Sie hier %d auswählen)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Geben Sie eine optionale Beschreibung ein. Beenden mit einer leeren Zeile:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Grund für Widerruf: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(Keine Beschreibung angegeben)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ist das richtig? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "Teile des geheimen Schlüssels sind nicht vorhanden\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "Schutzverfahren %d%s wird nicht unterstützt\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "Hashschutzverfahren %d wird nicht unterstützt\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Ungültige Passphrase; versuchen Sie es bitte noch einmal"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "WARNUNG: Unsicherer Schlüssel entdeckt -\n"
 "         bitte Passphrase nochmals wechseln.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "Die mißbilligte 16-bit Prüfsumme wird zum Schutz des geheimen Schlüssels "
 "benutzt\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "Unsicherer Schlüssel erzeugt - neuer Versuch\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schlüssels für "
 "sym.Verschlüsselung nicht vermieden werden!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "WARNUNG: Widersprechende Hashverfahren in der signierten Nachricht\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "WARNUNG: Signaturunterschlüssel %08lX hat keine Rücksignatur\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "WARNUNG: Signaturunterschlüssel %08lX hat eine ungültige Rücksignatur\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 "Öffentlicher Schlüssel %08lX ist um %lu Sekunde jünger als die Unterschrift\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 "Öffentlicher Schlüssel %08lX ist um %lu Sekunden jünger als die "
 "Unterschrift\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5669,7 +5674,7 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5677,65 +5682,40 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "Hinweis: Signaturschlüssel %08lX ist am %s verfallen.\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift von Schlüssel %08lX, wegen unbekanntem "
 "\"critical bit\"\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "Schlüssel %08lX: Kein Unterschlüssel für die Unterschlüsselwiderruf-"
 "Beglaubigung\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "Schlüssel %08lX: Kein Unterschlüssel für die Unterschlüsselanbindungs-"
 "Beglaubigung\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"Notationen können in einen v3 (PGP 2.x-artigen) Schlüssel nicht eingetragen "
-"werden\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"Notationen können in eine v3 (PGP 2.x-artige) Schlüsselunterschrift nicht "
-"eingetragen werden\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "WARNUNG: \"Notation\" kann nicht %%-erweitert werden (zu groß). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"Eine Policy URL kann in einen v3 (PGP 2.x-artigen) Schlüssel nicht "
-"eingetragen werden\n"
-
-# translated by wk
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"Eine Policy URL kann in einem v3 Schlüssel(PGP 2.x artig) nicht gespeichert "
-"werden\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5743,7 +5723,7 @@ msgstr ""
 "WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu gro0). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5752,77 +5732,77 @@ msgstr ""
 "WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu gro0). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Prüfung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s Unterschrift von: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schlüsseln eine abgetrennte "
 "Unterschrift erzeugt werden\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "Erzwingen des Hashverfahrens %s (%d) verletzt die Empfängervoreinstellungen\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie Klartextunterschriften nur mit PGP-2.x-artigen "
 "Schlüssel machen\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s Verschlüsselung wird verwendet\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "Schlüssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n"
 "echten Zufallsgenerator verwendbar\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "übersprungen '%s': doppelt\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "übersprungen '%s': %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "'%s übersprungen: Dies ist ein durch PGP erzeugter ElGamal-Schlüssel. Das "
 "ist für Signaturen NICHT sicher genug!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "Vertrauenssatz %lu, Typ %d: Schreiben fehlgeschlagen: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5831,358 +5811,358 @@ msgstr ""
 "# Liste de zugewiesenden Trustwerte, erzeugt am %s\n"
 "# (\"gpg --import-ownertrust\" um sie zu restaurieren)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "Zeile ist zu lang\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "Fehler: ungültiger Fingerabdruck\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "Importieren der \"Owner trust\"-Werte"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "Fehler beim Suchen des \"Trust records\": %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "Lesefehler: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "trustdb Transaktion zu groß\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "kann '%s' nicht schließen: %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Fehler beim Erzeugen des Versionsatzes: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ungültige trust-db erzeugt\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trust-db erzeugt\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "Notiz: Die \"trustdb\" ist nicht schreibbar\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ungültige 'Trust'-Datenbank\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Fehler beim Ändern des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: keine trustdb Datei\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: konnte Satz nicht anhängen: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Die \"Trust\"-Datenbank ist beschädigt; verwenden Sie \"gpg --fix-trustdb"
 "\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "Textzeilen länger als %d Zeichen können nicht benutzt werden\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "Eingabezeile ist länger als %d Zeichen\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ist keine gültige lange Schlüssel-ID\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "Schlüssel %08lX: Akzeptiert als vertrauenswürdiger Schlüssel\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "Schlüssel %08lX tritt mehr als einmal in der \"trustdb\" auf\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "Schlüssel %08lX: kein öffentlicher Schlüssel für den vertrauenswürdigen "
 "Schlüssel - übersprungen\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Schlüssel ist als uneingeschränkt vertrauenswürdig gekennzeichnet.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req type %d: read failed: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "Vertrauenssatz %lu ist nicht von der angeforderten Art %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[widerrufen]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[verfallen]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "unbekannt"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 #, fuzzy
 msgid "[marginal]"
 msgstr "marginal"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 #, fuzzy
 msgid "[ultimate]"
 msgstr "uneingeschränkt"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "unbestimmt"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "niemals   "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "vollständig"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "uneingeschränkt"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "\"Trust-DB\"-Überprüfung ist beim \"%s\"-Vertrauensmodell nicht nötig\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "\"Trust-DB\"-Änderung ist beim \"%s\"-Vertrauensmodell nicht nötig\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "Öffentlicher Schlüssel %08lX nicht gefunden: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "Bitte ein --check-trustdb durchführen\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird überprüft\n"
 
 # translated by wk
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d Schlüssel verarbeitet (%d Validity Zähler gelöscht)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "keine uneingeschränkt vertrauenswürdige Schlüssel gefunden\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "öff.Schlüssel des uneingeschränkt vertrautem Schlüssel %08lX nicht gefunden\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal-needed, %d complete-needed, %s Vertrauensmodell\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "\"Trust-DB\"-Versions-Satz kann nicht geändert werden: Schreiben "
 "fehlgeschlagen: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6197,310 +6177,331 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "Eingabezeile %u ist zu lang oder es fehlt ein LF\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "Allgemeiner Fehler"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "Unbekannter Pakettyp"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "Unbekannte Version"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "Unbekanntes Public-Key-Verfahren"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "Unbekanntes Hashverfahren"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "Falscher öffentlicher Schüssel"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "Falscher geheimer Schlüssel"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "Falsche Unterschrift"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "Prüfsummen-Fehler"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "Falsche Passphrase"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "Öffentlicher Schlüssel nicht gefunden"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "Unbekanntes Verschlüsselungsverfahren"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "Der Schlüsselbund kann nicht geöffnet werden"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "Ungültiges Paket"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "Ungültige ASCII-Hülle"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "Keine solche User-ID"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "Geheimer Schlüssel ist nicht vorhanden"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "Falscher geheimer Schlüssel benutzt"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "Wird nicht unterstützt"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "Falscher Schlüssel"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "Dateilesefehler"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "Dateischreibfehler"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "Unbekanntes Komprimierverfahren"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "Fehler beim Öffnen der Datei"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "Fehler beim Erzeugen der Datei"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "Ungültige Passphrase"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "nicht implementiertes öffentliches Schlüsselverfahren"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "Verschlüsselungsverfahren ist nicht implementiert"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "Unbekannte Unterschriftenklasse"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "Fehler in der Trust-DB"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "Falsche MPI"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "festdefinierte Ressourcenobergrenze erreicht"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "Ungültiger Schlüsselbund"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "Falsches Zertifikat"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "Ungünstig aufgebaute User-ID"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "Fehler beim Schließen der Datei"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "Fehler beim Umbenennen einer Datei"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "Fehler beim Löschen einer Datei"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "Unerwartete Daten"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "Zeitangaben differieren"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "Unbenutzbares öffentliches Schlüsselverfahren"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "Datei existiert bereits"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "Unsicherer Schlüssel"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "Ungültiges Argument"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "fehlerhafter URI"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "Nicht unterstützter URI"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "Netzwerkfehler"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "nicht verschlüsselt"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "nicht bearbeitet"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "unbrauchbarer öffentlicher Schüssel"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "unbrauchbarer geheimer Schlüssel"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "Schlüsselserverfehler"
 
-#: util/errors.c:109
+#: util/errors.c:107
 #, fuzzy
 msgid "canceled"
 msgstr "Abbruch"
 
-#: util/errors.c:110
+#: util/errors.c:108
 msgid "no card"
 msgstr "keine Karte"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "keine unterschriebene Daten\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr "FEHLER: "
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr "WARNUNG: "
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "jJyY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "nein"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "WARNUNG: Sensible Daten könnten auf Platte ausgelagert werden.\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "siehe http://www.gnupg.org/faq.html für weitere Informationen\n"
 
 # "  Um dies zu vermeiden, kann das Programm suid(root) installiert werden.\n"
 # "  Bitte wenden Sie sich hierzu an den Systemadministrator.\n"
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "Vorgang ist ohne sicheren Hauptspeicher nicht möglich\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 "(möglicherweise haben Sie das falsche Programm für diese Aufgabe benutzt)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "Notationen können in einen v3 (PGP 2.x-artigen) Schlüssel nicht "
+#~ "eingetragen werden\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "Notationen können in eine v3 (PGP 2.x-artige) Schlüsselunterschrift nicht "
+#~ "eingetragen werden\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "Eine Policy URL kann in einen v3 (PGP 2.x-artigen) Schlüssel nicht "
+#~ "eingetragen werden\n"
+
+# translated by wk
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "Eine Policy URL kann in einem v3 Schlüssel(PGP 2.x artig) nicht "
+#~ "gespeichert werden\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA benötigt einen 160-bit Hash Algorithmus\n"
 
diff --git a/po/el.po b/po/el.po
index 5f9b43b61..4496a62f7 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -14,92 +14,92 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "�������� ��������� ������ ������� �� �������� ��� %d bits\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "�������� ��������� ������ ������� �� �������� ��� %d bits\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "��� ����������� ������� �������� ���������\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "�������� ����� ����������� ��� �� `%s': %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ��� ����� �������� ������ - ���������\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "��������: �� ������ random_seed ����� �����\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "�������������: �� ������ ������� ������� random_seed - ���\n"
 "��������������\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "�������������: ����� �� �������� ���������� ������� �������!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -112,7 +112,7 @@ msgstr ""
 "�� ��������������� �������� ��� ����� �������� ��� ���� �� ���������!!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -121,7 +121,7 @@ msgstr ""
 "������ ����������, � �������� ��������������. ����� ��� ���� �������\n"
 "��� �� ��� ���������, ����� ���� �� ��������� ��� �������� ��� ��������.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -133,62 +133,62 @@ msgstr ""
 "�� ����������� �� ����������� ������� ����� ���� �� ������������\n"
 "����������� ��������! (����������� %d ����������� bytes)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -196,364 +196,369 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' ��� �����������\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 #, fuzzy
 msgid "generating new key\n"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "��������: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "�� ������ ����������� ���������: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "����������� ���������: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "�� ������ ����������� clearsig\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "����������� ���������: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "����������� �� ���������������� ���������\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "�� ����������� ��������:"
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "�� ������ dash escaped ������: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "�� ������� radix64 ���������� %02x ���������\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "������ ����� ������� (������� CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "������ ����� ������� (����� CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "����� ����� CRC\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "������ CRC: %06lx - %06lx\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "������ ����� ������� (��� �railer)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "������ ��� ������ trailer\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "�� ������ ��������: � ������ ����� ���� ��� %d ����������\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "�����������, �� ����������, ���������� ��� �������� - ���� ����� ����� "
 "������������� MTA\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "�� ������� ������ ��� ����� ���������"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "� ������� ���; "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "unspecified"
 msgstr "��� ���� ������� �����"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 #, fuzzy
 msgid "not forced"
 msgstr "�� �������������"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 #, fuzzy
 msgid "Language preferences: "
 msgstr "����������� ��������"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -561,293 +566,293 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "list all available data"
 msgstr "������ ��������� ���: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the login name"
 msgstr "������ ��� ����������� �����"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 #, fuzzy
 msgid "change the language preferences"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 #, fuzzy
 msgid "generate new keys"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "������> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "�� ������� ������ ��� ����� ���������"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "����������� �� ����� ������: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(����� ��� ������������� ��� ������ ��� ���������)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ ����� �� \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "�������� ����� ��� �������� ��� �� ����������; "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "���� ����� ��� ������� ������! - ������� �� ���������; "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "���������� ����������� ������������-���������\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "������� ��� ������� ������ ��� �� ������� ������ \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "�������� ������ ���� ����������� ������� ESK ���� ��� ���������� S2K\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "����� ��� ���������������: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ��� �����������\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�������������: `%s' ����� ��� ����� ������\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "������������� �� ������� RSA ��� 2048 bit � ��� ���� ���� �� ��������� --"
 "pgp2\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "�������� ��� `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "�������� ������ ��� ��������������� IDEA ��� ��� �� ������� �� �� "
 "�������������������.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -855,7 +860,7 @@ msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -864,105 +869,105 @@ msgstr ""
 "� ������������ ������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s ��������������� ���: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s ��������������� ��������\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "�������������: �� ������ ��������������� �� ������� ������ ���\n"
 "���������� ��������������.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "�������� ��� �������� ���������������� �������\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "��� ������������ � ������������� �������� ������������\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "�� ������� ���������� ������������ ����������������� ���� ��������� ������\n"
 "�������\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "���� � ��������� ������� ������. ������ ���� ����� ���������� ������������\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "�������� ��������� ��� %s \"%s\": %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "�������� ��������� ��� %s \"%s\": %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "������ ���������� ���� ��� ����� ���������� ������������: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "������� ������ ��� ���������� ������������\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "�������� ��������� ��� ���������� ������������\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "�������� ��������� ��� ��������� ��� ���������� ������������: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "�������������: �������� ��������� ���������� ������� `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
@@ -970,69 +975,69 @@ msgstr ""
 "� �������� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "�� ��������������� ������� ������"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "������ %08lX: ��� ����� ������������� - ������������\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "������ %08lX:  ������ ����� PGP 2.x - ������������\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�������������: �� ������� ������ %08lX ��� ���� ���� SK checksum\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "�������������: ��� ����� ������ �������\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1040,128 +1045,128 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "���������� ��� ������ �������� ��� ���������"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "�������� ���� ��������"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "�������� ���� �������� ������"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "�������� � ����������� ���� ��������"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "��������/���������� ��������"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1171,51 +1176,51 @@ msgstr ""
 "��������:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "���������"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "������� ���� ��� ���������"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1223,7 +1228,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1243,15 +1248,15 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1261,7 +1266,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1269,655 +1274,655 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "���������������: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
 "���������� ������\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [����������]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "���� ������ ������������ ��� pk cache - ����������������\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id ��� �������]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "����� ������"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "������� ��� �������� ��� ���� �� ����������"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "������� ��� ����������� ���� (timestamp) ���� ��� �������������"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|������� ��� ����������� ���������� ��� FD"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�����: gpgv [��������] [������] (-h ��� �������)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1925,7 +1930,7 @@ msgstr ""
 "�������: gpg [��������] [������]\n"
 "������� ��������� �� �������� �� ������ ������������ �������\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1936,7 +1941,7 @@ msgstr ""
 "������������,\n"
 "��� ���� ������ �� ����� �� ��� (������� �������������) ����-��������������."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1950,19 +1955,19 @@ msgstr ""
 "������\n"
 "���� ����� �����������\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "��� ������ �� ��������������� ���� �� �� ������������ ������, ��������� \"yes"
 "\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "�������������� �� user ID ��� �������� ����� ��� ������ �� �������� ������."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1976,7 +1981,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1986,16 +1991,16 @@ msgstr ""
 "��� �������������. ����� � ���������� ������ �� ��������������� ���� ��\n"
 "���������� ������. � �������� ���� ������� �� ������ ��������� ����������."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "�������������� �� ������� ��� ��������"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "��������� \"yes\"(���) � \"no\"(���)"
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2007,19 +2012,19 @@ msgstr ""
 "��� �� ������ ��� ���� �������� ��������� - �������� �� �������\n"
 "��������� �� ���������� ��� ���� ��� ��������."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "�������������� �� ����� ��� �������������"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "�������������� ����������� ��� ��������� email (����������)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "�������� ����������� �������������� ��� ������"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2033,13 +2038,13 @@ msgstr ""
 "O  ��� �������� ��� ����������� ��������.\n"
 "Q  ��� �� ����������� �� ���������� ��������."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "��������� \"yes\" (� ���� \"y\") ��� ����� ������� �� ������������ �� "
 "���������."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2111,12 +2116,12 @@ msgstr ""
 "\n"
 "��� ��� ������ ���� ����� � ����� ��������, ����� \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "��������� \"yes\" ��� ������ �� ���������� ��� �� user ID"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2124,11 +2129,11 @@ msgstr ""
 "��������� \"yes\" ��� ���������� ������ �� ��������� ����\n"
 "�� user ID.  ��� �� ������������� �� ������ ����!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "��������� \"yes\" ��� ����� ������� �� ��������� �� ���������"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2139,7 +2144,7 @@ msgstr ""
 "��������� ��� �������� ������������ ��� ������ � �� ��� ���� ������\n"
 "������������� ��� ����."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2151,7 +2156,7 @@ msgstr ""
 "��������������� ����� ���� �� ������ ��������� ������ �� ����������\n"
 "��� ������� ������������ ���� ���� ����� ��� �������������� ��������."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2159,7 +2164,7 @@ msgstr ""
 "� �������� ��� ����� ������.  ����� ������ �� ��������� ��� ��\n"
 "���������� ���."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2173,7 +2178,7 @@ msgstr ""
 "�� ������ ���.  ����� �� ���������� ���� ��� ���� � ����-�������� ���\n"
 "������ ���� ��� ����� ������ � ������� ��� �������."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2183,23 +2188,23 @@ msgstr ""
 "���� ������������ ����� �����������.  � ���������� ���� ��� ������������\n"
 "����-��������� �� ������� ���� 1 ������������.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "�������� ����������� �� ��������� ����� ������, ��� ��������."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "����� �� ����� ��� ������� ��� ����� ����������� � ��������"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "��������� \"yes\" ��� ����� ������� �� ����������� �� ������"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2207,7 +2212,7 @@ msgstr ""
 "�������� �������� ��� ��� ����� �������. ��� ���� �������� RETURN\n"
 "�� ��'������� ������ (������������� ���� �������) �� ��������������."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2235,7 +2240,7 @@ msgstr ""
 "      ��������������� ���� ��� �� �������� ��� �� user ID ��� ������\n"
 "      �� ��������������� ���. ��� �� ������� ����� ��� ��������� email.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2246,541 +2251,541 @@ msgstr ""
 "�������� �������� ���� �� ������� ���������. ��� ����� ������\n"
 "����� �� �������.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "��� ������� ��������� �������"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "��� ������� ��������� ������� ��� `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "�� ��������������� ������� ������"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "��������� �������� ��� ����� %d\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu ������� ����� ����� ���� ������������\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "��������� ������� ��� ��������������: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ��� ������� ��� �������������: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ����� user ID: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "              ����������: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             ����������: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          ��� user ID: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           ��� ����������: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        ���� ���������: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   ���� ���������� ��������: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      ����������� ������� �������: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ���������� ������� �������: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " ���������� ������� �������: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ��  ����������: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        ���� ���������: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      ����������� ������� �������: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "������ %08lX: ��� ���� ������ user ID\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "������ %08lX:  ��� ������ - ������������\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "������ %08lX: \"%s\" ����������\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "��� ������� �������������� ����������: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "������ %08lX: ������� ������ ���������\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "������ %08lX: ��� ��� ������� ����������\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "������ %08lX: �� ������� �� ������� ������: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
 "���������\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "������ %08lX: �� ��������������� ���������� �������� �������� ��� user id \"%"
 "s\"\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "������ %08lX: ������������ user ID '"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "������ %08lX: ������������ ���������\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� %"
 "08lX\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
 "��� ����� �����.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "������ %08lX: ����� �������� �������� ����������\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "���������� `%s' �������������\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[��������]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[����-��������]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 ���� ��������\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ����� ���������\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 �������� ��� ��������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ��������� ��� ���������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 �������� ��� ��������� ���� ���� ���������\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ��������� ��� ���������� ���� ���������\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 user ID ����������� ����� ������ ����-��������\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d user ID ������������ ����� ������� ����-���������\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2793,63 +2798,63 @@ msgstr ""
 "�� �������� passports ��� fingerprints ��� �������� �����...);\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = ��� ������ �����������\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = ��� ����� �����������\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "������� ������ ����� �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  �������� ���������.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�� user ID \"%s\" ���� �����."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2858,11 +2863,11 @@ msgstr ""
 "� ����-�������� ��� \"%s\"\n"
 "����� ��� �������� ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� OpenPGP ����-��������; (y/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2871,12 +2876,12 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "���� �����.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "������ �� ������� ��� ��� �������� ���� ������������� ��� ��������; (y/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2885,43 +2890,43 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "����� ��� ������ ��������.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� ����� ��������� ��������; (y/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "������� ������ ����� �� �� ��������������; (y/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "������ ��� �� ��������� �� �� ������  %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "���� �� ������ ���� �����!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���� �� ������ �������� �� ����� ���� %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "������ � ���������� �� ����� ����������;  (Y/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2929,11 +2934,11 @@ msgstr ""
 "�������� �� ��������������� ��� OpenPGP �������� �� ��� PGP 2.x ���� �� "
 "��������� --pgp2.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���� �� ����� �� ������ ������� �� �� PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2943,32 +2948,32 @@ msgstr ""
 "������ �������� ��� ����������� �����; ��� ��� ������ �� �� ���������� "
 "�������\"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) ��� ������.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) ��� ��� ������� �������.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��� ����� ��� ������ ������.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ��� ����� ���������� ������.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "� ������� ���; (�������������� ? ��� �����������): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2977,21 +2982,21 @@ msgstr ""
 "������� ������ �� ���������� ���� �� ������\n"
 "�� �� ������ ���: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "���� �� ����� ��� ����-��������.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "�������������: � �������� �� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
@@ -2999,14 +3004,14 @@ msgstr ""
 "�������������: � �������� �� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "� �������� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
@@ -3014,65 +3019,65 @@ msgstr ""
 "� �������� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "��� ��� ������� ������� ���� �� ������.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "��� ����� ����������� ������ �� ���� �� ������.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "��� ������� ���� ���������� ���� �� ������.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "������� � ����������� ����� ��� ��������:%s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3080,219 +3085,219 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "��� ������ ����� ������ - ���� ����� ������ *����* ����!\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "������� ������ �� ������ ����; "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "���������� ��������� �������� ��� ����� ����\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "���������� ��� ������"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "���������� ��� �������� ��� ��� user ID"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "�������� ���������"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "�������� ��� �������� ������"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "�������� ���� photo ID"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "�������� ���� �������� ���������"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�������� ��� user ID ��� ��������"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "������ ������ ��� ����������� �������� ��� �������� ��������"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "���������� ����������� (�������)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "���������� �������� (���������)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "������ ��� ������ ������"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "enable key"
 msgstr "����������� ��� ������"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "disable key"
 msgstr "������������� ��� ������"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "���������� photo ID"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "������ ���� ��� �������� �������� ����� �������� `%s': %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "�� ������� ������ ����� ���������.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�������� ��������������� ��� ������ \"toggle\" �����.\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3300,242 +3305,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "�� ������ ����������."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "������� �� ���������� ��� �� user ID; "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "������� ����� ���������"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "������ �� ��������� �� �������� ��� user ID.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "������� ����������� ��������"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "������� �� ���������� �� �����������;"
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "���������� ��� �������; "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "����������� ����� ����������; "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "����������: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (���������)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3543,19 +3548,19 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3563,7 +3568,7 @@ msgstr ""
 "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
 "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3572,75 +3577,75 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "�� ������ ��������"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3650,38 +3655,38 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
 "���������!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3689,341 +3694,341 @@ msgstr ""
 "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
 "N): "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
 "������������\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "�������� ���������: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��������� (y/N); "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "���������� %s photo ID �������� %ld ��� �� ������ 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "� ���������� %c%lu ������������\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "������� ������ ���������\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "������� ����-���������\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "������� ��������� \"�������\" ��������\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�� ������ ������� ��������, ����� %u bits\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��������������� ��� ������� �������� ��� %u bits\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 #, fuzzy
 msgid "Encrypt"
 msgstr "������������� ���������"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ��� ElGamal (��������������)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�� ������� �������� �� ������; (1024) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "����������������� ��� �� %u bits\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4039,7 +4044,7 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4055,40 +4060,40 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "�� ������ ����� ������ ���; (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "� �������� ����� ������ ���; (0) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "�� ������ ����\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "�� %s ����� ���� %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4096,12 +4101,12 @@ msgstr ""
 "�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
 "����, �� ����������� ����� ��� �� 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "����� ���� ����� (y/n); "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 #, fuzzy
 msgid ""
 "\n"
@@ -4118,44 +4123,44 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "������� �����: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "��������� Email: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "�� ������ ��������� Email\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "�� ������� ���������� ��� ������\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�������������� �� `%s' ��� ����������.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4166,7 +4171,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 
@@ -4181,23 +4186,23 @@ msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "��������, ��������� ����� �� ������\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4205,12 +4210,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4222,7 +4227,7 @@ msgstr ""
 "����� ������, �� ��� ������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4234,50 +4239,50 @@ msgstr ""
 "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
 "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "� ���������� �������� ����������.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4288,12 +4293,12 @@ msgstr ""
 "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
 "��� ���������� ������ ��� ���� �� ����.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4301,7 +4306,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4309,700 +4314,700 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
 "�� �� OpenPGP\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "������� �� ������������; "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "����     "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "�������� �������� ���������: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "�������� ���������: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "�������� �������� ���������: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "�������� ���������: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "����������"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "��������� �������� ��������:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "     ��������� �����������:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr " ��������� �������� ��������:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "      ��������� �����������:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     ��������� �������� ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�������������: 2 ������ �� ������������� ����������� ��������.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ����� �� ����������\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ����� �� ���\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "�������� ��������� ���� ��� ������ \"�����\" ���������\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "������� ����������� `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu ������� ����� �������� (%lu ���������)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu ������� ����� �������� (%lu ���������)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���������� �������������\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "�������������: �� �������� ��� `%s' ��� ����� ������� �� ���� ��� ��������\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "����������� �� �� ������ ��� %08lX ���� %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�������� ������� ��� ��� ������ ���������������� ��������� (%d)\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s ������ ���������������� ��������\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "������� ������ ����� %08lX\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "��������������� �������� �� ������� ������: ���� DEK\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "��������������� �� %s key, ID %08lX\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������� �� ������� ������ �������: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "��������������� �� %lu ������� �������\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "��������������� �� 1 ����� ������\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "������� %s ���������������� ���������\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "��������������� IDEA �� ����������, ��������� ���������� ������ ���\n"
 "%s ��������\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "���������������� OK\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�������������: ��� ������������� � ����������� ��� ��������\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�������������: �� ��������������� ������ ���� ���������!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "��������: � ���������� ������ \"���-��-�����-���-����\"\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "������ ����� �������='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "���������� �������� - ��������������� \"gpg --import\" ��� ��������\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "��������� ��������� ���������\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "�������� ��������� ����� ��� ��������� ���������\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "�������� ����� ��� %.*s �� ����� ��� ��������%s ID %08lX\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "������ ��������� ���: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "������� �������� ��� \""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[�������]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "�������"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "���������-��������"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "�������"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�������� ������� ��� ���������: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "��� ����� ���������� ��������\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
 
-#: g10/mainproc.c:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���������� �������� ������ 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�������� ������ ���� (PGP 2.x)\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "�������� ��������������� ��� core dump: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "�� ������������ ���������� ��������������"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "�� ����� ��� ��������������� IDEA ��� �������\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = ���������� ������������ �����������\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: �� ������������ ������� \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "�������� �������������� �� \"%s%s\" ��������\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "����������"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "����������"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "�� ������ `%s' ������� ���. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "��������� (y/N); "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ������� ��������\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "�������������� ��� ��� ����� �������"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "������� ���� stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "������� �������������� ��������� ��� `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "������������� ��� ������ �������� `%s'\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "�������������: �� �������� ��� `%s' ��� ����� ������� �� ���� ��� ��������\n"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: ��������� �������������\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "�������� �� ��� agent - �������������� ��� ������ ��� agent\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (����� ������, ID %08lX)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5014,28 +5019,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s ������, ID %08lX, ���������� %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "����������� �� �����\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "�������������� �� ����� ������\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "�������� �������� ��� ����� ������ �� ��������� ������\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "�������������� �� ����� ������: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5045,21 +5050,21 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������ �� ������� ������\n"
 "��� �� ������: \""
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "����������� �� ����� ������: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5073,164 +5078,164 @@ msgstr ""
 "�������������� ��� ������ ������ �� ������ ��� ���������� �� ����� ������!\n"
 "������� ������� ��� ��� ������ ����� ���� ����� ��� 240x288.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "�������������� ��� ����� ������� ��� �� photo ID: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" ��� ����� JPEG ������\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "����� ���� � ���������� ����� (y/N/q); "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "�������� ����������� ��� photo ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "��� ���� ������� �����"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "�� ������ ���� ����������"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "�� ������ ���� �������"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "�� ������ �� ��������������� �����"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "�� User ID ��� ����� ����� ������"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "����� ��� ��������:"
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "������ ���������:"
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "��� ������ ���� ������������ ���:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                ������ ��� \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "���� �� ������ ������� ������ ���� ���������\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = ��� ����\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d =  ��� ��� �����������\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = ������������ �������\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = ���� ��� ������ �����\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = ��������� ����� ��� ��������\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = �����������\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "� ������� ���; "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "������� ������ ���� �� ������ �� ������� ��� �������� ������������; "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "������������� ��� ������� �� ��� ������ �������� ������������:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: ��� ������� ������� ��� � �������� ���� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: ��� ������� ������� ��� � �������� ���� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "���� �� ������ ������� ������ ���� ���������\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "���� �� ������ ������ �� ����\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5242,115 +5247,115 @@ msgstr ""
 "�� ���������� ���� ������� ������� ����������\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "����� ���������� ����� ��� ��������; "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "�������������: ����� �������� ����� �����������!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "�������������: ���� �� ������ ������ �� ��������� (������ �� ������ "
 "���������)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "�������������: ���� �� ������ ���� ��������� ��� ��� ��������� ���!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         ���� ������ �� �������� ��� � �������� ����� ������������.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 "�������������: ���� �� ��������� ���� ��������� ��� ��� ��������� ���!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "��������: ���� �� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "��������: ���� �� ������ ���� �����!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "�������������: ���� �� ������ ��� ���� ������������ �� ������������ "
 "��������!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         ��� ������� ������� ��� � �������� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "�������������: ��� �������������� ���� �� ������!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         � �������� ������ ����� ������������.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "�������������: ���� �� ������ ��� ���� ������������ �� ���������\n"
 "������� ������������!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         ��� ����� ������ ��� � �������� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ������������: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ������������: ������� ������ ����� ��� �����\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "��� �������� ��� user ID. (��������������� �� \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5358,169 +5363,169 @@ msgstr ""
 "\n"
 "�������������� �� user ID. ����� �� ��� ����� ������: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "��� ������� ���� �� user ID.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "������������: ������� ������ ���� ��� ������� ��� �� ������� ����������\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "�� ������� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "������������: ������� ������ ���� ��� �������\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ������������: �� ������� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "������ ������ ���������\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "�������� ��� �������������. ���������� �� ��� ������� \"--output\"\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "���������� ��������.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "�������� �� ����� ������� ���������: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "�������� ��� stdin ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "��� �������� ������������� ��������\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "�������� ��������� �������������� ��������� `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "�������� ���������� ������ �������� �������� %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "�������, ������� � �������� ����������.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "������ ������������ ��� DEK ��� �������������\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "� ���������� �������������� %d%s ����� �������� � �����������������\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "��������: � ���������� �������������� %d ��� ����� ���� ��������\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "��������: �� ������ ���� ���������"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet �������: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "���� �������� ���:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(���� ����� ��� ��������� ������ ���������)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "������������ ������ �� ����������� ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet �������: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "������������� ��������� �������������.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "�� ������� ������ `%s' �� �������: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "��������: ���� �� ������ ��� �������������!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5539,126 +5544,126 @@ msgstr ""
 "������� �� ������� ��������� ��� �������� ��� ������ �� ����������� ���\n"
 "�������� ��� �� ��� ����� ��������� �� ������!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "�������"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(������� �� ������ �� ��������� �� %d ���)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "�������������� ��� ����������� ��������޷ ����� �� ��� ����� ������:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "����� ��� ��������: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(��� ������ ���������)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "����� ���� �������; "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "������� ��� �������� �������� ��� ����� ���������\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "�� ������ ����� ������, ��������� ����"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "�������������: ����������� ������� ������ - ������� �� ����� ������\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "���������� ��� �� ������������� 16-bit checksum ��� �� ��������� ���\n"
 "�������� ��������\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "������������� ������� ������ - ��������� �����������\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "�������� �������� �������� �������� ��� ���������� ��������������, ������ "
 "��� %d �����!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "�������������: ��������� ��������� ��������� ��� ������\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
 "������������\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ���� ����� ���' ������������� "
 "�����������\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 "�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 "�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5666,7 +5671,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5674,54 +5679,34 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "��������: �� ������ ��������� %08lX ����� ���� %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "������� ����� ��������� ��� ������ %08lX ���� �������� �������� bit\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "������ %08lX: ������ ��������� ��� �� ������ ��������� �����������\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� �����������\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"�������� ����������� ��������� �������� �� ��������� v3 (PGP 2.x ����)\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"�������� ����������� ��������� �������� �� ��������� �������� v3 (PGP 2.x "
-"����)\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "�������������: �������� ���� %%-�������� ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "�������� ����������� URL ��������� �� ��������� v3 (PGP 2.x ����)\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"�������� ����������� URL ��������� �� ��������� �������� v3 (PGP 2.x ����)\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5729,7 +5714,7 @@ msgstr ""
 "�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5738,23 +5723,23 @@ msgstr ""
 "�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s �������� ���: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ����������-���������� �� ������� ����� PGP 2.x ���� ��\n"
 "--pgp2 ���������\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5762,53 +5747,53 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "��������:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ���������� ������ �� ������� ����� PGP 2.x �� ��������� --pgp2\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s ������������� �� ��������������\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "�� ������ ��� ���� ��������� ��� ��������� - ��� ������ �� �������������� �� "
 "������� RNG!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "������������ `%s': ������������\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "������������ `%s': %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "������������ `%s': ���� ����� ������������� ��� PGP ������ ElGamal ��� ��� "
 "����� ������� ��� ���������!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5817,350 +5802,350 @@ msgstr ""
 "# ����� ��� ������������ ����� ������������, ������������� %s\n"
 "# (����� ��� \"gpg --import-ownertrust\" ��� ��������� ����)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "� ������ ����� ���� ������\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "�������� ��� ����� ������������"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "������ ���� ������ ��� �������� ������������: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "������ ���������: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync �������: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: �������� lseek: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: �������� write (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "���� ������ ��������� trustdb\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: � ������� ��� �������!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: �������� ����������� ���� �������� �������: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ������������� �� ������ trustdb\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: ������������� � trustdb\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "��������: � trustdb ��� ����� ���������\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: �� ������ trustdb\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: �������� ����������� hashtable: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: ������ ���� ��������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: ������ ���� �������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: ������ ���� ������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: ������� lseek: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ��� ����� trustdb ������\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: ������� ������� �� recnum %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: �� ������ ������ ������� %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ������ ���� ������� ��� �������� dir : %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �������� ���� ��������� ���� ��������: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �������� ���� �������� ���� ��������: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "� trustdb ����� �������� - ��������������� �� \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "�������� ��������� ������� �������� ����������� ��� %d ����������\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "������ ������� ���������� ��� %d ����������\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' ��� ����� ������ ����� keyID\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "������ %08lX: ������� ��� ������ �� �����������\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "�� ������ %08lX ������� ���� ��� ��� ���� ���� trustdb\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "������ %08lX: ������ ������� ������ ��� �� ������ �� ����������� - "
 "���������\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "�������� �������� ��� �������� ������������.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "������� trust %lu, req ����� %d: read �������: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "� ������� trust %lu ��� ����� ��� ���������� ����� %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[����������]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[�������]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "�������"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "����     "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "�������� ������� ��� trustdb �� ����� ���� %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "�� ������� ������ %08lX ��� �������: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "�������� ����� ��� --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "������� ��� trustdb\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ������� �������������� (%d ��������� ����������� �������)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "�� �������� ������� ������������ �������\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6175,309 +6160,326 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "������ ������� %u ����� ���� ������ � ��� ������ �� LF\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "������ ������"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "�������� ����� �������"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "������� ������"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "�������� ���������� �������� ��������"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "�������� ���������� ���������"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "���� ������� ������"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "���� ������� ������"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "���� ��������"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "������ checksum"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "���� ����� ������"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "��� ������� �� ������� ������"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "�������� ���������� ��������������"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "�������� ��������� ��� ����������"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "�� ������ ������"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "�� ������ ��������"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "������� ��������� ������ (user id)"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "�� ������� ������ ��� ����� ���������"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "����� ����� �������� ��������"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "��� �������������"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "���� ������"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "������ ��������� �������"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "������ �������� �������"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "�������� ���������� ���������"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "������ ��������� �������"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "������ ����������� �������"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "�� ������ ����� ������"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "�� ������������ ���������� �������� ��������"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "�� ������������ ���������� ��������������"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "������� ����� ���������"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "������ ��� ����� ��������� ������������"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "���� MPI"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "���� �����"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "�� ������ ����������"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "���� �������������"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "��������������� ��������� ������ (user id)"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "������ ����������� �������"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "������ ������������ �������"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "������ ��������� �������"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "�� ����������� ��������"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "��������� ���� (timestamp)"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "�� ���������������� ���������� �������� ��������"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "�� ������ �������"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "������� ������"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "�� ������ ������"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "���� URI"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "�� �������������� URI"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "������ �������"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "�� ���������������"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "�� �������������"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "�� ��������������� ������� ������"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "�� ��������������� ������� ������"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "������ ���������� ��������"
 
-#: util/errors.c:109
+#: util/errors.c:107
 #, fuzzy
 msgid "canceled"
 msgstr "�������"
 
-#: util/errors.c:110
+#: util/errors.c:108
 #, fuzzy
 msgid "no card"
 msgstr "�� ���������������"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "��� �������� ������������� ��������\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... ���� ����� bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "������� ��� bug ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "���|���"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "���|���"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "�����������"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "�������������: ����� �� �������� ������!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "����� �� http://www.gnupg.org/faq.html ��� ������������ �����������\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "� ���������� ��� ����� ������ ����� �������������� ������ �����\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "�������� ����������� ��������� �������� �� ��������� v3 (PGP 2.x ����)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "�������� ����������� ��������� �������� �� ��������� �������� v3 (PGP 2.x "
+#~ "����)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "�������� ����������� URL ��������� �� ��������� v3 (PGP 2.x ����)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "�������� ����������� URL ��������� �� ��������� �������� v3 (PGP 2.x "
+#~ "����)\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "� DSA ������� �� ����� ���� 160 bit ���������� hash\n"
 
diff --git a/po/eo.po b/po/eo.po
index 80673255b..3cc4136a9 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -14,91 +14,91 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr ""
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr ""
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ne povas stat-i '%s': %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ne estas normala dosiero - ignorita\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "noto: dosiero random_seed estas malplena\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "ne povas legi '%s': %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "noto: dosiero random_seed ne aktualigita\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "ne povas skribi '%s': %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -112,14 +112,14 @@ msgstr ""
 "NE UZU DATENOJN KREITAJN DE �I TIU PROGRAMO!!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -130,62 +130,62 @@ msgstr ""
 "Nesufi�e da stokastaj datenoj. Bonvolu fari ion por ebligi al la\n"
 "mastruma sistemo kolekti pli da entropio! (Mankas %d bitokoj)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -193,364 +193,369 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 #, fuzzy
 msgid "key already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 #, fuzzy
 msgid "generating new key\n"
 msgstr "krei novan �losilparon"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "nevalida kiraso�apo: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "kiraso�apo: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "nevalida �apo de klarteksta subskribo\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "kiraso�apo: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "ingitaj klartekstaj subskriboj\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "neatendita kiraso:"
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "nevalida strek-eskapita linio: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "tro frua dosierfino (nenia CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "tro frua dosierfino (en CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "misformita CRC\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-eraro; %06lx - %06lx\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "tro frua dosierfino (en vosto)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "eraro en vostolinio\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted-printable-signo en kiraso - ver�ajne cima po�totransendilo estis "
 "uzata\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "sekreta �losilo ne havebla"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 #, fuzzy
 msgid "male"
 msgstr "en"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "female"
 msgstr "en"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenia kialo specifita"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 #, fuzzy
 msgid "not forced"
 msgstr "ne traktita"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualigitaj preferoj"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingrospuro:"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -558,463 +563,463 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the login name"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 #, fuzzy
 msgid "change the language preferences"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan �losilparon"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "sekreta �losilo ne havebla"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ripetu pasfrazon: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "ne povas fari tion en neinteraga re�imo sen \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Tio estas sekreta �losilo! �u vere forvi�i �in? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "eblas �ifri nur per RSA-�losiloj de maksimume 2048 bitoj kun --pgp2\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "legas el '%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "ne povas uzi la �ifron IDEA por �iuj �losiloj, al kiuj vi �ifras.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, fuzzy, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s-�ifrita por: %s\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVERTO: mesa�o estis �ifrita per malforta �losilo en la simetria �ifro.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "problemo �e traktado de �ifrita paketo\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, fuzzy, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr ""
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr ""
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, fuzzy, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoki flankan �losilon"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "neuzebla sekreta �losilo"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "�losilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "�losilo %08lX: PGP-2.x-stila �losilo - ignorita\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1022,128 +1027,128 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "aktualigi �iujn �losilojn de �losilservilo"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1153,51 +1158,51 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1205,7 +1210,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1225,15 +1230,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1243,7 +1248,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1251,658 +1256,658 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "ne eblas samtempe subskribi kaj �ifri kun --pgp2\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "tro da registroj en pk-staplo - mal�altas\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "malkongruo de tempostampoj"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1912,7 +1917,7 @@ msgstr ""
 "al alia persono. Ni bezonas �in por realigi la fido-reton; �i neniel\n"
 "rilatas al la (implicite kreita) atestilo-reto."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1924,18 +1929,18 @@ msgstr ""
 "aliron al la sekreta �losilo. Respondu \"jes\" por igi �i tiun �losilon\n"
 "absolute fidata\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Se vi tamen volas uzi �i tiun nefidatan �losilon, respondu per \"jes\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Donu la uzantidentigilon de la adresito, al kiu vi volas sendi la mesa�on."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1949,23 +1954,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Donu la �losilgrandon"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Respondu per \"jes\" a� \"ne\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1977,19 +1982,19 @@ msgstr ""
 "bonan eraromesa�on; anstata�e la sistemo provas interpreti\n"
 "la donitan valoron kiel gamon."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Donu la nomon de la �losilposedanto"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "bonvolu doni retadreson (ne devige, sed tre rekomendate)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Bonvolu doni nedevigan komenton"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2003,11 +2008,11 @@ msgstr ""
 "B  por da�rigi kun la �losilkreado.\n"
 "F  por interrompi la �losilkreadon kaj fini."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Respondu per \"jes\" (a� nur \"j\"), se la sub�losilo estu kreita."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2077,12 +2082,12 @@ msgstr ""
 "\n"
 "Se vi ne scias la �ustan respondon, respondu per \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Respondu per \"jes\", se vi volas subskribi �iujn uzantidentigilojn"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2090,11 +2095,11 @@ msgstr ""
 "Respondu per \"jes\", se vi vere volas forvi�i la uzantidentigilon.\n"
 "Tiam anka� �iuj atestiloj perdi�os!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Respondu per \"jes\", se la sub�losilo estu forvi�ita"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2104,7 +2109,7 @@ msgstr ""
 "�i tiun subskribon, �ar eble �i estos grava por establi fido-ligon\n"
 "al la �losilo a� al alia �losilo atestita per �i tiu �losilo."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2116,7 +2121,7 @@ msgstr ""
 "�losilo estis uzita, �ar la subskribanta �losilo eble establos\n"
 "fido-ligon tra alia jam atestita �losilo."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2124,7 +2129,7 @@ msgstr ""
 "La subskribo ne estas valida. Estas prudente forigi �in de\n"
 "via �losilaro."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2138,7 +2143,7 @@ msgstr ""
 "mem-subskribo estas ial nevalida, kaj dua mem-subskribo estas\n"
 "havebla."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 #, fuzzy
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
@@ -2149,24 +2154,24 @@ msgstr ""
 "al la aktuala listo de preferoj. La dato de �iuj trafitaj\n"
 "mem-subskriboj estos anta�enigitaj je unu sekundo.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Bonvolu ripeti la pasfrazon, por kontroli, ke vi bone scias, kion vi tajpis."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Donu la nomon de la dosiero, al kiu la subskribo apliki�as"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Respondu per \"jes\", se la dosiero estu surskribita"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2174,7 +2179,7 @@ msgstr ""
 "Bonvolu doni novan dosiernomon. Se vi premas nur ENEN, la implicita\n"
 "dosiero (montrita en parentezo) estos uzata."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2202,7 +2207,7 @@ msgstr ""
 "      Uzu �i tion por aserti, ke la uzantidentigilo ne plu estu uzata;\n"
 "      normale oni uzas �i tion por marki retadreson kiel nevalidan.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2212,530 +2217,530 @@ msgstr ""
 "�i tiun revokatestilon. Bonvolu fari �i tiun tekston konciza.\n"
 "Malplena linio finas la tekston.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Nenia helpo disponata"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenia helpo disponata por '%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr ""
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "neuzebla sekreta �losilo"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu �losiloj jam traktitaj\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "    ignoritaj novaj �losiloj: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  ne�an�itaj: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      novaj uzantidentigiloj: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novaj sub�losiloj: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         novaj �losilrevokoj: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "sekretaj �losiloj importitaj: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas trovi originalan �losilblokon: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "�losilo %08lX: publika �losilo mankas - ne povas apliki revokatestilon\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "�losilaro '%s' kreita\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revoko]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 malbona subskribo\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d malbonaj subskriboj\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 subskribo ne kontrolita pro manko de �losilo\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d subskriboj ne kontrolitaj pro manko de �losiloj\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 subskribo ne kontrolita pro eraro\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2748,64 +2753,64 @@ msgstr ""
 "kontrolante fingrospurojn el diversaj fontoj ...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fidas iomete\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi plene fidas\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2816,7 +2821,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 #, fuzzy
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
@@ -2825,7 +2830,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2836,12 +2841,12 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2852,7 +2857,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
@@ -2861,53 +2866,53 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "�i tiu �losilo eksvalidi�is!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 #, fuzzy
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 #, fuzzy
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2916,31 +2921,31 @@ msgstr ""
 "Kiom zorge vi kontrolis, ke la �losilo, kiun vi subskribos, vere apartenas\n"
 "al la supre nomita persono? Se vi ne scias la respondon, donu \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Mi ne respondas.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Mi tute ne kontrolis.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Mi malzorge kontrolis.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Mi tre zorge kontrolis.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2949,98 +2954,98 @@ msgstr ""
 "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Mi tute ne kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Mi malzorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Mi tre zorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti �i tiun �losilon: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3048,11 +3053,11 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3060,207 +3065,207 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "forvi�i uzantidentigilon"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "add a subkey"
 msgstr "al"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "add a revocation key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marku uzantidentigilon kiel �efan"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "enable key"
 msgstr "�alti �losilon"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "disable key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "montri foto-identigilon"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eraro dum legado de sekreta �losilbloko '%s': %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3268,266 +3273,266 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 #, fuzzy
 msgid "Key is revoked."
 msgstr "�losilo estas revokita.\n"
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nekonata klaso de subskribo"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�u vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr "Notacio: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3536,75 +3541,75 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "nevalida"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -3614,375 +3619,375 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 #, fuzzy
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de la �efa �losilo.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�u surskribi (j/N)? "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "prefero %c%lu ripetita\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 #, fuzzy
 msgid "Sign"
 msgstr "subskribi"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 #, fuzzy
 msgid "Encrypt"
 msgstr "�ifri datenojn"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-�losilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3998,7 +4003,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4014,40 +4019,40 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�losilo validu por ...? (0) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s eksvalidi�os je %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4055,12 +4060,12 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 #, fuzzy
 msgid ""
 "\n"
@@ -4076,44 +4081,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4124,7 +4129,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
 
@@ -4139,23 +4144,23 @@ msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (F)ini? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (B)one/(F)ini? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4163,12 +4168,12 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4180,7 +4185,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4192,50 +4197,50 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4244,12 +4249,12 @@ msgstr ""
 "Notu, ke �i tiu �losilo ne estas uzebla por �ifrado. Vi eble volos\n"
 "uzi la komandon \"--edit-key\" por krei flankan �losilon por tiu celo.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4257,7 +4262,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4265,703 +4270,703 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTO: krei sub�losilojn por v3-�losiloj ne estas OpenPGP-kongrue\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�u vere krei? "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "Subskribo-gvidlinioj: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Subskribo-gvidlinioj: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 #, fuzzy
 msgid "Critical signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "�losilaro"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s estas la ne�an�ita\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s estas la nova\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Bonvolu ripari �i tiun eblan sekurecproblemon\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrolas �losilaron '%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: �losilaro kreita\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 #, fuzzy
 msgid "disabled"
 msgstr "el"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida �losilidentigilo\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "�ifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supozas %s �ifritajn datenojn\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "mal�ifrado sukcesis\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenia helpo disponata"
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 #, fuzzy
 msgid "binary"
 msgstr "�efa"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "nerealigita �ifrad-metodo"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "la aldona�o por la �ifro IDEA en �eestas\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = bonvolu montri pli da informoj\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ne traktita"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ne traktita"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, fuzzy, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Dosiero '%s' ekzistas. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "�u surskribi (j/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nekonata sufikso\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Donu novan dosiernomon"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "skribas al la normala eligo\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "supozas subskribitajn datenojn en '%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, fuzzy, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problemo kun agento - mal�altas uzadon de agento\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (�ef�losilo %08lX)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4972,28 +4977,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Donu pasfrazon\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Donu pasfrazon: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5003,21 +5008,21 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5026,168 +5031,168 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "Nenia kialo specifita"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "�losilo estas anstata�igita."
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "�losilo estas kompromitita"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "�losilo estas ne plu uzata"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "Uzantidentigilo ne plu validas"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 #, fuzzy
 msgid "reason for revocation: "
 msgstr "Kialo por revoko: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 #, fuzzy
 msgid "revocation comment: "
 msgstr "Komento pri revoko: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMfFsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nenia fidovaloro atribuita al:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "�i tiu �losilo ver�ajne apartenas al la posedanto\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Ne scias\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Ni NE fidas �i tiun �losilon\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Mi fidas absolute\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = reen al la �efmenuo\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = supersalti �i tiun �losilon\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " f = fini\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Via decido? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "�u vi vere volas �an�i �i tiun �losilon al absoluta fido? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Atestiloj, kiuj kondukas al absolute fidata �losilo:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Estas nenia indiko, ke �i tiu �losilo vere apartenas al la posedanto\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Estas nenia indiko, ke �i tiu �losilo vere apartenas al la posedanto\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "�i tiu �losilo ver�ajne apartenas al la posedanto\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "�i tiu �losilo apartenas al ni\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5199,111 +5204,111 @@ msgstr ""
 "la sekva demando per \"jes\"\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "�u tamen uzi �i tiun �losilon? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVERTO: Uzas nefidatan �losilon!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Tio povas signifi, ke la subskribo estas falsa.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVERTO: �i tiu sub�losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Noto: �i tiu �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Noto: �i tiu �losilo eksvalidi�is!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVERTO: �i tiu �losilo ne estas atestita kun fidata subskribo!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Estas nenia indiko, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTO: Ni NE fidas �i tiun �losilon!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La subskribo ver�ajne estas FALSA.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVERTO: �i tiu �losilo ne estas atestita kun sufi�e fidataj subskriboj!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorita: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorita: publika �losilo jam �eestas\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5311,172 +5316,172 @@ msgstr ""
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorita: publika �losilo jam difinita kiel implicita ricevonto\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "Publika �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "ignorita: publika �losilo jam agordita\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datenoj ne savitaj; uzu la opcion \"--output\" por savi ilin\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Aparta subskribo.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Bonvolu doni la nomon de la dosiero: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "legas la normalan enigon ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "mankas subskribitaj datenoj\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "nenomita ricevonto; provas per sekreta �losilo %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bone; ni estas la nenomita ricevonto.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "malnova kodado de DEK ne estas realigita\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifrad-metodo %d%s estas nekonata a� mal�altita\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "listigo de �losilblokoj malsukcesis: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5487,122 +5492,122 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "�u tamen uzi �i tiun �losilon? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Nevalida pasfrazo; bonvolu provi denove"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVERTO: Malforta �losilo trovita - bonvolu �an�i la pasfrazon denove.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "malforta �losilo kreita - provas denove\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "ne povas eviti malfortajn �losilojn por simetria �ifro; provis %d fojojn!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la publika �losilo estas %lu sekundojn pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5610,7 +5615,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5618,50 +5623,34 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTO: subskribo-�losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, fuzzy, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5669,7 +5658,7 @@ msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5678,421 +5667,421 @@ msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 #, fuzzy
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "eblas klartekste subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �ifrado estos aplikata\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "�losilo ne estas markita kiel malsekura - ne povas uzi �in kun falsa "
 "stokastilo!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignoris '%s': ripetita\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "ignoris '%s': �i tio estas PGP-kreita ElGamal-�losilo, kiu ne estas sekura "
 "por subskribado!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importi posedantofido-valorojn"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "eraro dum legado de dosieruja registro: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "fido-datenaro: sync malsukcesis: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "fido-datenaro-transakcio tro granda\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dosierujo ne ekzistas!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: malsukcesis krei versiregistron: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: nevalida fido-datenaro kreita\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: fido-datenaro kreita\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: nevalida fido-datenaro\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eraro dum aktualigo de versiregistro: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eraro dum skribado de versiregistro: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "fido-datenaro: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiregistro kun registronumero %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: malsukcesis nuligi registron: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: malsukcesis aldoni registron: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la fido-datenaro estas fu�ita; bonvolu ruli \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "ne povas trakti tekstliniojn pli longajn ol %d signojn\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "enigata linio pli longa ol %d signojn\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ne estas valida longa �losilidentigilo\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "�losilo %08lX: akceptita kiel fidata �losilo\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "�losilo %08lX aperas pli ol unufoje en la fido-datenaro\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "�losilo %08lX: mankas publika �losilo por fidata �losilo - ignorita\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "�losilo markita kiel absolute fidata.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "fido-datenaro loko %lu, petospeco %d: lego malsukcesis: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "fido-registro %lu ne havas petitan specon %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "rev"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "eksval"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nekonata versio"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika �losilo %08lX ne trovita: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6107,308 +6096,308 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "enigata linio %u tro longa, a� mankas linifino\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "�enerala eraro"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "nekonata paketo-speco"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "nekonata versio"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "nekonata publik�losila metodo"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "nekonata kompendi-metodo"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "malbona publika �losilo"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "malbona sekreta �losilo"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "malbona subskribo"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "eraro en kontrolsumo"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "malbona pasfrazo"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "publika �losilo ne trovita"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "nekonata �ifrad-metodo"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "ne povas malfermi la �losilaron"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "nevalida paketo"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "nevalida kiraso"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "uzantidentigilo ne ekzistas"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "sekreta �losilo ne havebla"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "mal�usta sekreta �losilo uzata"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "ne realigita"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "malbona �losilo"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "legeraro �e dosiero"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "skriberaro �e dosiero"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "nekonata densig-metodo"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "eraro �e malfermo de dosiero"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "eraro �e kreo de dosiero"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "nevalida pasfrazo"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "nerealigita publik�losila metodo"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "nerealigita �ifrad-metodo"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "nekonata klaso de subskribo"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "eraro en fido-datenaro"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "malbona MPI"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "trafis rimedolimon"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "nevalida �losilaro"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "malbona atestilo"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "misformita uzantidentigilo"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "eraro �e fermo de dosiero"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "eraro �e renomado de dosiero"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "eraro �e forvi�o de dosiero"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "neatendita dateno"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "malkongruo de tempostampoj"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "neuzebla publik�losila metodo"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "dosiero ekzistas"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "malforta �losilo"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "nevalida argumento"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "malbona URI"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "nerealigita URI"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "reteraro"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "ne �ifrita"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "ne traktita"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "neuzebla publika �losilo"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "neuzebla sekreta �losilo"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "�losilservila eraro"
 
-#: util/errors.c:109
+#: util/errors.c:107
 #, fuzzy
 msgid "canceled"
 msgstr "nuligita de uzanto\n"
 
-#: util/errors.c:110
+#: util/errors.c:108
 #, fuzzy
 msgid "no card"
 msgstr "ne �ifrita"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "mankas subskribitaj datenoj\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... �i tio estas cimo (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 #, fuzzy
 msgid "yes"
 msgstr "jes"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "ne"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "fini"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "fF"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 #, fuzzy
 msgid "cC"
 msgstr "k"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 #, fuzzy
 msgid "WARNING: using insecure memory!\n"
 msgstr "Averto: uzas malsekuran memoron!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "bonvolu vidi http://www.gnupg.org/faq.html por pliaj informoj\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 
diff --git a/po/es.po b/po/es.po
index 64ba03ed4..031855d51 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,52 +8,52 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 1.4.1\n"
+"Project-Id-Version: GnuPG 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-04-03 13:28+0200\n"
-"PO-Revision-Date: 2005-03-25 16:50+0100\n"
+"POT-Creation-Date: 2007-10-23 12:03+0200\n"
+"PO-Revision-Date: 2007-10-23 11:32+0200\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "no se puede generar un primo con pbits=%u qbits=%u\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "no se puede generar un primo con menos de %d bits\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "no se ha detectado m�dulo acumulador de entrop�a\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "no se puede bloquear `%s'\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no se puede obtener informaci�n de `%s': %s\n"
@@ -63,51 +63,51 @@ msgstr "no se puede obtener informaci�n de `%s': %s\n"
 # Sugerencia a la sugerencia: �qu� tal omitido? (pasar en silencio una
 # cosa; excluirla de lo que se habla o escribe) dice el diccionario.
 # Bien. Tambi�n se puede poner "descartado".
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s` no es un fichero regular - descartado\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "nota: el fichero de semillas aleatorias est� vac�o\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "ATENCI�N: tama�o incorrecto del fichero de semillas aleatorias - no se usa\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no se puede leer `%s': %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no se puede escribir `%s': %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no se puede cerrar `%s': %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ATENCI�N: �usando un generador de n�meros aleatorios inseguro!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -121,7 +121,7 @@ msgstr ""
 "�NO USE DATOS GENERADOS POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -131,7 +131,7 @@ msgstr ""
 "el ordenador mientras tanto si eso hace que no se aburra, porque eso\n"
 "mejorar� la calidad de la entrop�a.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -143,62 +143,62 @@ msgstr ""
 "otro trabajo para que el sistema pueda recolectar m�s entrop�a\n"
 "(se necesitan %d bytes m�s).\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo guardando la fecha de creaci�n: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallo leyendo la clave\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr "la respuesta no incluye la clave p�blica\n"
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr "la respuesta no incluye el m�dulo RSA\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la respuesta no incluye el exponente p�blico RSA\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "la funci�n de manejo del PIN devolvi� un error: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "El PIN para CHV%d es demasiado corto; longitud m�nima %d\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la verificaci�n CHV%d fall�: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr "el acceso a �rdenes de administrador no est� configurado\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr "error recuperando el estatus CHV de la tarjeta\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr "�la tarjeta est� bloqueada permanentemente!\n"
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -208,346 +208,351 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr "|A|PIN Administrador"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nuevo PIN Administrador"
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr "|N|Nuevo PIN"
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error obteniendo nuevo PIN: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 msgid "error reading application data\n"
 msgstr "error leyendo datos de la aplicaci�n\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 msgid "error reading fingerprint DO\n"
 msgstr "error leyendo huella digital DO\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 msgid "key already exists\n"
 msgstr "la clave ya existe\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr "la clave existente ser� reemplazada\n"
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 msgid "generating new key\n"
 msgstr "generando nueva clave\n"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "exponente p�blico demasiado grande (m�s de 32 bits)\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr "por favor, espere mientras se genera la clave ...\n"
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 msgid "generating key failed\n"
 msgstr "la generaci�n de la clave fall�\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generaci�n de clave completada (%d segundos)\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "estructura de la tarjeta OpenPGP inv�lida (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, fuzzy, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [firmas hechas: %lu]"
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "cabecera de armadura inv�lida: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "cabecera de armadura: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "cabecera de firma clara inv�lida\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "cabecera de armadura: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "firmas en texto claro anidadas\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 msgid "unexpected armor: "
 msgstr "armadura inesperada: "
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "L�nea con guiones inv�lida: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter inv�lido radix64 %02X omitido\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "Fin de fichero prematuro (falta suma de comprobaci�n)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "Fin de suma de comprobaci�n prematuro\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "Suma de comprobaci�n mal creada\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Error en suma de comprobaci�n: %06lX - %06lX\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 msgid "premature eof (in trailer)\n"
 msgstr "fin de fichero prematuro (en el cierre)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "error en la l�nea de cierre\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: l�nea m�s larga de %d caracteres\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caracter \"quoted printable\" en la armadura - probablemente se us�\n"
 "un MTA defectuoso\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tarjeta OpenPGP no disponible: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr "[no establecido]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 msgid "male"
 msgstr "hombre"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "female"
 msgstr "mujer"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "unspecified"
 msgstr "no especificado"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "not forced"
 msgstr "no forzado"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr "forzado"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: s�lo se permite ASCII sin formato actualmente.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: El caracter \"<\" no puede usarse.\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: no se permiten dobles espacios.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr "Apellido del titular de la tarjeta: "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr "Nombre del titular de la tarjeta: "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Error: nombre combinado demasiado largo (m�ximo %d caracteres).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 msgid "URL to retrieve public key: "
 msgstr "URL de donde recuperar la clave p�blica: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Error: URL demasiado larga (el m�ximo son %d caracteres).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr "Datos de login (nombre de la cuenta): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Error: el login es demasiado largo (l�mite de %d caracteres).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr "Datos privados: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 "Error: los datos privados son demasiado largos (l�mite de %d caracteres).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 msgid "Language preferences: "
 msgstr "Preferencias de idioma: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: longitud de la cadena de preferencias inv�lida.\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: caracteres inv�lidos en cadena de preferencias.\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sexo ((H)ombre, (M)mujer o espacio): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 msgid "Error: invalid response.\n"
 msgstr "Error: respuesta no v�lida.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 msgid "CA fingerprint: "
 msgstr "Huella dactilar CA:"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: formato inv�lido de huella dactilar.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "la operaci�n con la clave no es posible: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 msgid "not an OpenPGP card"
 msgstr "no es una tarjeta OpenPGP"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr "�Reemplazar la clave existente? (s/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "�Hacer copia de seguridad externa a la tarjeta de clave de cifrado? (S/n)"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr "�Reemplazar las claves existentes? (s/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -558,138 +563,138 @@ msgstr ""
 "   PIN = `%s'     PIN Administrador = `%s'\n"
 "Deber�a cambiarlos usando la orden --change-pin\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor seleccione tipo de clave que generar:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 msgid "   (1) Signature key\n"
 msgstr "    (1) Clave de firmado\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Clave de cifrado\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificaci�n\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 msgid "Please select where to store the key:\n"
 msgstr "Por favor elija donde guardar la clave:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n de clave desconocido\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 msgid "secret parts of key are not available\n"
 msgstr "las partes secretas de la clave no est�n disponibles\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 msgid "secret key already stored on a card\n"
 msgstr "clave secreta ya almacenada en una tarjeta\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "show admin commands"
 msgstr "ver �rdenes de administrador"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "list all available data"
 msgstr "listar todos los datos disponibles"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr "cambiar el nombre del titular de la tarjeta"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr "cambiar URL de donde obtener la clave"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr "recuperar la clave especificada en la URL de la tarjeta"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change the login name"
 msgstr "cambiar nombre de usuario"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "change the language preferences"
 msgstr "cambiar preferencias de idioma"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr "cambiar sexo del titular de la tarjeta"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "change a CA fingerprint"
 msgstr "cambiar huella dactilar de una CA"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr "cambiar estado de la opci�n forzar firma del PIN"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 msgid "generate new keys"
 msgstr "generar nuevas claves"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr "men� para cambiar o desbloquear el PIN"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 msgid "Admin-only command\n"
 msgstr "�rdenes s�lo de administrador\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 msgid "Admin commands are allowed\n"
 msgstr "Se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 msgid "Admin commands are not allowed\n"
 msgstr "No se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "clave secreta no disponible"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Inserte la tarjeta y pulse Intro o escriba 'c' para cancelar: "
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -698,130 +703,130 @@ msgstr ""
 "Por favor retire la tarjeta actual e inserte la de n�mero de serie:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Pulse Intro cuando est� listo"
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr "Introduzca nuevo PIN de administrador: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr "Introduzca el nuevo PIN: "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr "Introduzca PIN de administrador: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr "Introduzca PIN: "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 msgid "Repeat this PIN: "
 msgstr "Repita este PIN: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN repetido incorrectamente; int�ntelo de nuevo"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave \"%s\" no encontrada: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "error leyendo bloque de claves: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(excepto si especifica la clave dando su huella digital)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "imposible hacer esto en modo de proceso por lotes sin \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "�Eliminar esta clave del anillo? (s/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "�Es una clave secreta! �Eliminar realmente? (s/N) "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "borrada informaci�n de propietarios\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use antes la opci�n \"--delete-secret-key\" para borrarla.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "no puede usar un paquete sim�trico ESK debido al modo S2K\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "usando cifrado %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ya est� comprimido\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "solo puede cifrar a claves RSA de 2048 bits o menos en modo --pgp2\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "no se puede usar el algoritmo IDEA para todas las claves a las que cifra.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -829,7 +834,7 @@ msgstr ""
 "AVISO: forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -838,165 +843,165 @@ msgstr ""
 "AVISO: forzar el algoritmo de compresi�n %s (%d) va en contra\n"
 "de las preferencias del receptor\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "no puede usar %s en modo %s\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATENCI�N: mensaje cifrado con una clave d�bil en el cifrado sim�trico.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "problema trabajando con un paquete cifrado\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "no es posible ejecutar programas remotos\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no se puede crear el directorio `%s': %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "llamadas a programas externos inhabilitadas por permisos inseguros de "
 "ficheros.\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "esta plataforma necesita ficheros temporales para llamar a programas "
 "externos\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "no se puede ejecutar el programa `%s': %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "no se puede ejecutar el int�rprete de �rdenes `%s': %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "error del sistema llamando al programa externo: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "el programa externo finaliz� anormalmente\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "no se puede ejecutar el programa externo\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "no se puede leer la respuesta del programa externo: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "AVISO: no se puede borrar fichero temporal (%s) `%s': %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: no se puede borrar el fichero temporal `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "La firma se marcar� como no revocable.\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "no se encuetran claves de revocaci�n para \"%s\"\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoca clave o subclaves seleccionadas"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "clave secreta inutilizable"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 msgid "exporting secret keys not allowed\n"
 msgstr "no se permite exportar claves secretas\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "clave %s: no protegida - omitida\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clave %s: clave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVISO: la clave secreta %s no tiene suma de comprobaci�n simple SK\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCI�N: no se ha exportado nada\n"
 
@@ -1004,7 +1009,7 @@ msgstr "ATENCI�N: no se ha exportado nada\n"
 # S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
 # puede acentuar? �demasiado alta?
 # �Qui�n dice que no se puede? :-)
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1012,127 +1017,127 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr "escribir estado de la tarjeta"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr "cambiar datos en la tarjeta"
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr "cambiar el PIN de la tarjeta"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1142,47 +1147,47 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr "usar estilo OpenPGP estricto"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr "generar mensajes compatibles con PGP 2.x"
 
@@ -1190,7 +1195,7 @@ msgstr "generar mensajes compatibles con PGP 2.x"
 # p�gina man -> p�gina de manual
 # Vale. �del manual mejor?
 # Hmm, no s�, en man-db se usa "de". La verdad es que no lo he pensado.
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1198,7 +1203,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1218,15 +1223,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1236,7 +1241,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1244,71 +1249,71 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no se encontr� el signo = en la definici�n de grupo `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedad insegura del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1316,18 +1321,18 @@ msgstr ""
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVISO: propiedad insegura del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1335,470 +1340,470 @@ msgstr ""
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVISO: permisos inseguros del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "muestra en qu� anillos est� una clave"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "no se carga el cifrado de ampliaci�n `%s' por permisos inseguros\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "no se ejecutar� en memoria insegura por %s\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s�lo puede hacer firmas separadas o en claro en modo --pgp2\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el cifrado `%s' en modo %s\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el resumen `%s' en modo %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no puede usar la compresi�n `%s' en modo %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no puede usar --symetric --encrypt en modo %s\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1806,61 +1811,61 @@ msgstr "[nombre_fichero]"
 # En espa�ol no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario d�jalo siempre.
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiados registros en la cache pk - anulada\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 msgid "[User ID not found]"
 msgstr "[ID de usuario no encontrado]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Clave %s inv�lida hecha v�lida mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "no hay subclave secreta para la subclave p�blica %s - ignorada\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando subclave %s en vez de clave primaria %s\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clave %s: clave secreta sin clave p�blica - omitida\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "tomar las claves de este anillo"
 
@@ -1868,19 +1873,19 @@ msgstr "tomar las claves de este anillo"
 # Creo que es mejor "con el sello de fecha", no es un conflicto
 # del sello en si mismo sino en relaci�n con el mensaje.
 # Ok.
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "hacer que los conflictos de fecha-hora sean s�lo un aviso"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1888,7 +1893,7 @@ msgstr ""
 "Sintaxis: gpg [opciones] [ficheros]\n"
 "Confrontar las firmas contra claves conocidas\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1898,7 +1903,7 @@ msgstr ""
 "terceros. Es necesario para implementar la red de confianza, no tiene nada\n"
 "que ver con la red de certificados (impl�citamente creada)."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1910,16 +1915,16 @@ msgstr ""
 "puede acceder a la clave secreta. Conteste \"s�\" para hacer que esta\n"
 "clave se considere como de total confianza\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Si quiere usar esta clave no fiable de todos modos, conteste \"s�\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Introduzca el ID de usuario al que quiere enviar el mensaje."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1942,7 +1947,7 @@ msgstr ""
 "\n"
 "La primera clave (clave primaria) debe ser siempre de tipo capaz de firmar."
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1952,16 +1957,16 @@ msgstr ""
 "cifrar. Este algoritmo deb�ria usarse solo en ciertos contextos.\n"
 "Por favor consulte primero a un experto en seguridad."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Introduzca la longitud de la clave"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"s�\" o \"no\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1973,21 +1978,21 @@ msgstr ""
 "buena respuesta a los errores; el sistema intentar� interpretar el valor\n"
 "introducido como un intervalo."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Introduzca el nombre del due�o de la clave"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 "Introduzca una direcci�n de correo electr�nico (opcional pero muy\n"
 "recomendable)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Introduzca un comentario opcional"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2001,11 +2006,11 @@ msgstr ""
 "O  para continuar con la generaci�n de clave.\n"
 "S  para interrumpir la generaci�n de clave."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Responda \"s�\" (o s�lo \"s\") para generar la subclave."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2080,11 +2085,11 @@ msgstr ""
 "\n"
 "Si no sabe qu� contestar, conteste \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Responda \"s�\" si quiere firmar TODOS los IDs de usuario"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2092,11 +2097,11 @@ msgstr ""
 "Responda \"s�\" si realmente quiere borrar este ID de usuario.\n"
 "�Tambi�n se perder�n todos los certificados!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"s�\" si quiere borrar esta subclave"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2106,7 +2111,7 @@ msgstr ""
 "borrar esta firma ya que puede ser importante para establecer una conexi�n\n"
 "de confianza con la clave o con otra clave certificada por �sta."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2118,13 +2123,13 @@ msgstr ""
 "se us�, ya que dicha clave podr�a establecer una conexi�n de confianza\n"
 "a trav�s de otra clave certificada."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Esta firma no es v�lida. Tiene sentido borrarla de su anillo."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2137,7 +2142,7 @@ msgstr ""
 "volver a usar esta clave. As� que b�rrela tan s�lo si esta autofirma no\n"
 "es v�lida por alguna raz�n y hay otra disponible."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2147,25 +2152,25 @@ msgstr ""
 "seleccionados) a la lista actual de preferencias. El sello de tiempo\n"
 "de todas las autofirmas afectadas se avanzar� en un segundo.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Repita la �ltima frase contrase�a para asegurarse de lo que tecle�."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Introduzca el nombre del fichero al que corresponde la firma"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"s�\" para sobreescribir el fichero"
 
 # Sugerencia: ENTER -> INTRO.
 # Aceptada.
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2173,7 +2178,7 @@ msgstr ""
 "Introduzca un nuevo nombre de fichero. Si pulsa INTRO se usar� el fichero\n"
 "por omisi�n (mostrado entre corchetes)."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2202,7 +2207,7 @@ msgstr ""
 "      seguir siendo usada; esto se utiliza normalmente para marcar una\n"
 "      direcci�n de correo-e como inv�lida.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2212,534 +2217,534 @@ msgstr ""
 "este certificado de revocaci�n. Por favor, que el texto sea breve.\n"
 "Una l�nea vac�a pone fin al texto.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Ayuda no disponible"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No hay ayuda disponible para `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "�la clave p�blica y la privada no se corresponden!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "clave secreta inutilizable"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "omitiendo bloque de tipo %d\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu claves procesadas hasta ahora\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Cantidad total procesada: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      omitidas nuevas claves: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sin identificador: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importadas: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             sin cambios: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     nuevos identificativos: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nuevas firmas: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones de claves: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          no importadas: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, fuzzy, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "AVISO: la clave %s contiene preferencias para no disponible\n"
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "algoritmos en estos IDs de usuarios:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": algoritmo de cifrado preferido %s\n"
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": algoritmo de resumen preferido %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": algoritmo de compresi�n preferido %s\n"
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "se recomienda encarecidamente que actualice sus preferencias y\n"
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "re-dustribuya esta clave para evitar potenciales problemas de\n"
 "diferencias en los algoritmos.\n"
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clave %s: reparada la subclave PKS corrompida\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clave %s: aceptado ID de usuario sin autofirma \"%s\"\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clave %s: sin identificadores de usuario v�lidos\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "esto puede ser debido a la ausencia de autofirma\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clave %s: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clave %s: clave nueva - omitida\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clave %s: clave p�blica \"%s\" importada\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clave %s: no coincide con nuestra copia\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clave %s: \"%s\" 1 firma nueva\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clave %s: \"%s\" 1 subclave nueva\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clave %s: \"%s\" sin cambios\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clave %s: clave secreta con cifrado inv�lido %d - omitida\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "no se permite importar claves secretas\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hay anillo secreto de claves por defecto: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clave %s: clave secreta importada\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clave %s: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clave %s: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %s: falta la clave p�blica - imposible emplear el\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %s: certificado de revocaci�n inv�lido: %s - rechazado\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clave %s: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clave %s: no hay identificador de usuario para la firma\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "clave %s: algoritmo de clave p�blica no disponible para ID \"%s\"\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clave %s: autofirma inv�lida para el id \"%s\"\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clave %s: no hay subclave que unir a la clave\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clave %s: uni�n de subclave inv�lida\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clave %s: borrado enlace de subclaves m�ltiples\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clave %s: no hay subclave para la revocaci�n de clave\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clave %s: revocaci�n de subclave inv�lida\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clave %s: borrada revocaci�n de subclave m�ltiple\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clave %s: omitido ID de usuario \"%s\"\n"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clave %s: subclave omitida\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clave %s: firma no exportable (clase 0x%02x) - omitida\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "clave %s: certificado de revocaci�n en lugar equivocado - omitido\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %s: certificado de revocaci�n no valido: %s - omitido\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "clave %s: firma de clase (0x%02x) inesperada - omitida\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clave %s: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: recuperando clave de revocaci�n %s\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: falta clave de revocaci�n %s.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clave %s: \"%s\" certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clave %s: firma directa de clave a�adida\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOTA: un S/N de la clave no coincide con la de la tarjeta\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOTA: clave primaria en l�nea y almacenada en la tarjeta\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOTA: clave secundaria en l�nea y almacenada en la tarjeta\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "anillo `%s' creado\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "%s: problema lectura del bloque de clave: %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firmas no comprobadas por falta de clave\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firmas no comprobadas por errores\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Detectado 1 identificador de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Detectados %d identificadores de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2751,17 +2756,17 @@ msgstr ""
 "pasaportes, comprobando huellas dactilares en diferentes fuentes...)\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Conf�o un poco\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2771,46 +2776,46 @@ msgstr ""
 "Un nivel mayor que 1 permite que la clave que est� firmando pueda\n"
 "hacer firmas de confianza en su nombre.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Introduzca un dominio para restringir esta firma, o intro para nada.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID de usuario \"%s\" expirado."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID de usuario \"%s\" no tiene autofirma."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID de usuario \"%s\" no tiene autofirma."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2819,11 +2824,11 @@ msgstr ""
 "La autofirma en \"%s\"\n"
 "es una firma de tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quiere convertirla en una autofirma OpenPGP? (s/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2832,11 +2837,11 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "ha expirado.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quiere producir una nueva firma que reemplace a la expirada? (s/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2845,43 +2850,43 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "es una firma local.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada localmente por la clave %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada por la clave %s\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quiere firmarlo a�n as�? (s/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que firmar con la clave %s\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "�Esta clave ha caducado!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta clave expirar� el %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quiere que su firma caduque al mismo tiempo? (S/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2889,11 +2894,11 @@ msgstr ""
 "No puede hacer una firma OpenPGP de una clave PGP 2.x estando en modo --"
 "pgp2.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Esto inutilizar�a la clave en PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2903,31 +2908,31 @@ msgstr ""
 "firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
 "contestar, introduzca \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No contesto.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No lo he comprobado en absoluto.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He hecho una comprobaci�n informal.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Lo he comprobado meticulosamente.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�Su elecci�n? (escriba '?' si desea m�s informaci�n): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2936,76 +2941,76 @@ msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
 "con su clave: \"%s\" (%s)?\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 msgid "This will be a self-signature.\n"
 msgstr "Esto ser� una autofirma.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ATENCION: la firma no se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "AVISO: la firma no se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La firma se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La firma se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "I have not checked this key at all.\n"
 msgstr "No he comprobado esta clave en absoluto.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 msgid "I have checked this key casually.\n"
 msgstr "He comprobado esta clave informalmente.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 msgid "I have checked this key very carefully.\n"
 msgstr "He comprobado esta clave meticulosamente.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "La clave tiene s�lo un apuntador u objetos de clave en la propia tarjeta\n"
 "- no hay frase contrase�a que cambiar.\n"
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3013,11 +3018,11 @@ msgstr ""
 "Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3025,187 +3030,187 @@ msgstr ""
 "No ha especificado frase contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Realmente quiere hacer esto? (s/N) "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "muestra huella dactilar de la clave"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "selecciona subclave N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "comprueba firmas"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "firmar IDs seleccionadas [* ver debajo �rdenes relacionadas]"
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs locally"
 msgstr "firma localmente los IDs de usuarios elegidos"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a trust signature"
 msgstr "firmar IDs seleccionados con firma de confianza"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "firmar IDs seleccionados con firma no revocable"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "a�adir un identificador de usuario"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "a�adir un ID fotogr�fico"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 msgid "delete selected user IDs"
 msgstr "borrar identificadores de usuario seleccionados"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "add a subkey"
 msgstr "a�adir una subclave"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr "a�adir clave a tarjeta"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr "mover una clave a la tarjeta"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr "mover una clave de respaldo a la tarjeta"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 msgid "delete selected subkeys"
 msgstr "borrar clave secundaria"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "a�adir una clave de revocaci�n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 msgid "delete signatures from the selected user IDs"
 msgstr "borrar firmas de los ID seleccionados"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "cambiar la fecha de caducidad para la clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 msgid "flag the selected user ID as primary"
 msgstr "marcar ID de usuario seleccionado como primario"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "mostrar preferencias (experto)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "mostrar preferencias (prolijo)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "set preference list for the selected user IDs"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "establecer URL del servidor de claves preferido por los IDs seleccionados"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 msgid "revoke signatures on the selected user IDs"
 msgstr "revocar firmas de los identificadores seleccionados"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 msgid "revoke selected user IDs"
 msgstr "revocar los identificadores seleccionados"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "revoke key or selected subkeys"
 msgstr "revoca clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 msgid "enable key"
 msgstr "habilita clave"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 msgid "disable key"
 msgstr "deshabilita clave"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 msgid "show selected photo IDs"
 msgstr "mostrar fotos de los ID seleccionados"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error leyendo bloque de clave secreta \"%s\": %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor use la orden \"cambia\" primero.\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3216,226 +3221,226 @@ msgstr ""
 "locales (lsign), una 't' para firmas fiables (tsign), `nr' para firmas no\n"
 "revocables (nrsign) o cualquier combinaci�n de ellas (ltsign, tnrsign, etc)\n"
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "La clave est� revocada."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Firmar realmente todos los IDs de usuario? (s/N) "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Clase de firma desconocida `%s'\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Esta orden no se permite en modo %s.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Borrar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Borrar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 msgid "Really move the primary key? (y/N) "
 msgstr "�Borrar realmente la clave primaria? (s/N)"
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar exactamente una clave.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr "La orden espera un nombre de fichero como argumento\n"
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "No se puede abrir `%s': %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Error leyendo clave de respaldo desde `%s': %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�De verdad quiere borrar esta clave? (s/N) "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Revocar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Revocar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�De verdad quiere revocar la clave completa? (s/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�De verdad quiere revocar las subclaves seleccionadas? (s/N)"
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�De verdad quiere revocar esta subclave? (s/N) "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "La confianza del propietario no puede establecerse si se est� usando\n"
 "una base de datos de confianza propocionada por el usuario\n"
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 msgid "Set preference list to:\n"
 msgstr "Establecer lista de preferencias a:\n"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Actualizar realmente las preferencias para los ID seleccionados? (s/N) "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 msgid "Really update the preferences? (y/N) "
 msgstr "�Actualizar realmente las preferencias? (s/N) "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 msgid "Save changes? (y/N) "
 msgstr "�Grabar cambios? (s/N) "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 msgid "Quit without saving? (y/N) "
 msgstr "�Salir sin grabar? (s/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr "Sevidor de claves no-modificar"
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaci�n: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta clave fue revocada en %s por %s clave %s\n"
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta clave puede ser revocada por %s clave %s"
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "caduc�: %s"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, c-format
 msgid "trust: %s"
 msgstr "confianza: %s"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr "validez: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3443,17 +3448,17 @@ msgstr ""
 "Por favor, advierta que la validez de clave mostrada no es necesariamente\n"
 "correcta a menos de que reinicie el programa.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "caducada"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3461,7 +3466,7 @@ msgstr ""
 "AVISO: ning�n ID de usuario est� marcado como principal. Esta orden puede\n"
 "       causar que se tome como principal por defecto otro ID de usuario.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3470,75 +3475,75 @@ msgstr ""
 "AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
 "hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No puede a�adir un ID fotogr�fico a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "Armadura no v�lida"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3547,359 +3552,359 @@ msgstr ""
 "AVISO: esta es una clave tipo PGP2. A�adir un revocador designado puede\n"
 "       hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No puede a�adir un revocador designado a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no puede elegir una clave como su propio revocador designado\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "esta clave ya ha sido designada como revocadora\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�AVISO: no podr� deshacer la elecci�n de clave como revocador designado!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "�Est� seguro de querer elegir esta clave como revocador designado? (s/N) "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "AVISO: la subclave de firmado %s no tiene certificado cruzado\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notaci�n de firma: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�Sobreescribir? (s/N) "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con �ndice %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "firmada con su clave %s el %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Ha firmado estos IDs de usuario con la clave %s:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Mostrando ID fotogr�fico %s de tama�o %ld para la clave %s (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferencia `%s' duplicada\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias de cifrado\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferencias de resumen\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias de compresi�n\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter inv�lido `%s' en cadena de preferencias\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "escribiendo firma directa\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobaci�n de clave\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 msgid "Sign"
 msgstr "Firma"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr "Autentificaci�n"
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr "FfCcAaSs"
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Posibles accriones para una %s clave: "
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr "Acciones permitidas actualmente: "
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Conmutar la capacidad de firmar\n"
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Conmutar la capacidad de cifrado\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Conmutar la capacidad de autentificaci�n\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Acabado\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrar)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "El par de claves DSA tendr� %u bits.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "las claves %s pueden tener entre %u y %u bits de longitud.\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�De qu� tama�o quiere la clave? (%u) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "los tama�os de claves %s deben estar en el rango %u-%u\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3915,7 +3920,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3931,38 +3936,38 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Clave v�lida �durante (0)? "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 msgid "Signature does not expire at all\n"
 msgstr "La firma nunca caduca\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3970,11 +3975,11 @@ msgstr ""
 "Su sistema no puede mostrar fechas m�s all� del 2038.\n"
 "Sin embargo funcionar� correctamente hasta el 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 msgid "Is this correct? (y/N) "
 msgstr "�Es correcto? (s/n) "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3990,44 +3995,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido en el comentario\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4038,7 +4043,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor no ponga la direcci�n de correo-e en el nombre real o en el "
@@ -4055,23 +4060,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (S)alir? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4079,12 +4084,12 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4096,7 +4101,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4109,50 +4114,50 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escribiendo apuntador de la clave privada en `%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo p�blico `%s': %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4160,12 +4165,12 @@ msgstr ""
 "Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n"
 "la orden \"--edit-key\" para crear una subclave con este prop�sito.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4173,7 +4178,7 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4181,688 +4186,688 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaves para claves V3 no sigue el est�ndar OpenPGP\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 msgid "Really create? (y/N) "
 msgstr "�Crear de verdad? (s/N) "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "almacenado de clave en la tarjeta fallido: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no se puede crear fichero de respaldo `%s': %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "nunca     "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Pol�tica de firmas cr�ticas: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Pol�tica de firmas: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "Servidor de claves cr�tico preferido: "
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Notaci�n de firmas cr�ticas: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Notaci�n de firma: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Anillo de claves"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Huellas dactilares de la clave primaria:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "     Huella de subclave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr " Huella de clave primaria:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "      Huella de subclave:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 msgid "      Key fingerprint ="
 msgstr "      Huella de clave ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr "      N�mero de serie de la tarjeta ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "renombrando `%s' en `%s' fallo: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCI�N: existen 2 ficheros con informaci�n confidencial.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "memorizando anillo `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu claves memorizadas hasta ahora (%lu firmas)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu claves memorizadas (%lu firmas)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVISO: las opciones de servidor de claves `%s' no se usan en esta "
 "plataforma\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduzca n�mero(s), O)tro, o F)in >"
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocolo del servidor de claves inv�lido (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "clave \"%s\" no encontrada en el servidor\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 msgid "key not found on keyserver\n"
 msgstr "clave no encontrada en el servidor\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando clave %s de %s servidor %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando clave %s de %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "buscando \"%s\" de %s servidor %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "buscando \"%s\" de %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "enviando clave %s a %s servidor %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "enviando clave %s a %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" de %s servidor %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" de %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 msgid "no keyserver action!\n"
 msgstr "�no se solicita ninguna acci�n al servidor de claves!\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVISO: el manejo de claves procede de una versi�n diferente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr "el servidor de claves no envi� VERSION\n"
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no hay servidores de claves conocidos (use opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "no se pueden realizar llamadas a un servidor externo de claves tal y\n"
 "como est� compilado el programa\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "no hay un manejador para ese esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "la acci�n `%s' no es posible con este esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s no permite usar la versi�n %d del manejador\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 msgid "keyserver timed out\n"
 msgstr "agotado el tiempo de espera para el servidor de claves\n"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 msgid "keyserver internal error\n"
 msgstr "error interno del servidor de claves\n"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "error de comunicaci�n con el servidor de claves: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" no es un identificador de clave v�lido: omitido\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "renovando 1 clave de %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "renovando %d claves desde %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 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:239
+#: g10/mainproc.c:243
 #, 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:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s clave de sesi�n cifrada\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, 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:381
+#: g10/mainproc.c:385
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clave p�blica es %s\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados con la clave p�blica: DEK correcta\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado con clave %s, ID %s\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu frases contrase�a\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 frase contrase�a\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suponiendo %s datos cifrados\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATENCI�N: la intgridad del mensaje no est� protegida\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no se puede trabajar con firmas m�ltiples\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firmado el %s\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               usando %s clave %s\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "Clave disponible en: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma INCORRECTA de \"%s\""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "binaria"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "desconocido"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 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:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los volcados de core: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat de `%s' fall� en %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) fall� en %s: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "AVISO: usando un algoritmo de clave p�blica experimental %s\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "AVISO: usando algoritmo de cifrado experimental %s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "AVISO: usando algoritmo de resumen experimental %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVISO: el algoritmo de resumen %s es una opci�n desaconsejada\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el plugin para el cifrado IDEA no est� presente\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = por favor mu�streme m�s informaci�n\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n desaconsejada \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor use \"%s%s\" en su lugar\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "Sin comprimir"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 msgid "uncompressed|none"
 msgstr "sin_comprimir|ninguno"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "este mensaje podr�a no ser utilizable por %s\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "opci�n ambigua `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "El fichero `%s' ya existe. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 msgid "Overwrite? (y/N) "
 msgstr "�Sobreescribir? (s/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufijo desconocido\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Introduzca nuevo nombre de fichero"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "escribiendo en stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "asumiendo que hay datos firmados en `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "creado un nuevo fichero de configuraci�n `%s'\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, 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"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "directorio `%s' creado\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: clave de sesi�n cifrada sim�tricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con el agente - inhabilitando el uso del agente\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(ID de clave primaria %s)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4873,27 +4878,27 @@ msgstr ""
 "del usuario: \"%.*s\"\n"
 "%u bits, clave %s, ID %s, creada el %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Repita frase contrase�a\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Introduzca frase contrase�a\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr "imposible pedir frase contrase�a en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Introduzca frase contrase�a: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4902,21 +4907,21 @@ msgstr ""
 "Necesita una frase contrase�a para desbloquear la clave secreta\n"
 "del usuario: \"%s\"\n"
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$s, creada el %4$s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subclave en clave principal ID %s)"
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Repita frase contrase�a: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4930,117 +4935,117 @@ msgstr ""
 "Si usa una foto muy grande, �su clave ser� tambi�n muy grande!\n"
 "Una imagen cercana a 240x288 tiene un tama�o adecuado.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduzca nombre del fichero JPEG para ID fotogr�fico: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Imposible abrir fichero JPEG `%s': %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "�Este JPEG es realmente grande (%d bytes)!\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�Seguro que quiere usarlo? (s/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' no es un fichero JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "�Es correcta la foto? (s/n) "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "�no puedo mostrar ID fotogr�fico!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "No se dio ninguna raz�n"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "La clave ha sido reemplazada."
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "La clave ha sido comprometida"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "La clave ya no est� en uso"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "El identificador de usuario ya no es v�lido"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "raz�n para la revocaci�n: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "comentario a la revocaci�n: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 msgid "No trust value assigned to:\n"
 msgstr "No hay confianza definida para:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  alias \"%s\"\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "�Qu� seguridad tiene de que esta clave pertenece realmente al usuario\n"
 "que se nombra?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = No lo s� o prefiero no decirlo\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NO tengo confianza\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = conf�o absolutamente\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 msgid "  m = back to the main menu\n"
 msgstr "  m = volver al men� principal\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  s = skip this key\n"
 msgstr "  s = saltar esta clave\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  q = quit\n"
 msgstr "  q = salir\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5049,41 +5054,41 @@ msgstr ""
 "El m�nimo nivel de confianza para esta clave es: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "�Su decisi�n? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "�De verdad quiere asignar absoluta confianza a esta clave? (s/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que llevan a una clave de confianza absoluta:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: No hay seguridad de que esta clave pertenezca realmente\n"
 "al usuario que se nombra\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Hay poca seguridad de que esta clave pertenezca realmente\n"
 "al usuario que se nombra\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta clave probablemente pertenece al usuario que se nombra\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Esta clave nos pertenece\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5093,110 +5098,110 @@ msgstr ""
 "identificador de usuario. Si *realmente* sabe lo que est� haciendo,\n"
 "puede contestar s� a la siguiente pregunta.\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 msgid "Use this key anyway? (y/N) "
 msgstr "�Usar esta clave de todas formas? (s/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATENCI�N: �Usando una clave no fiable!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "AVISO: la clave puede estar revocada (falta clave de revocaci�n)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ATENCI�N: �Esta clave ha sido revocada por la persona designada\n"
 "como revocador!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Esto puede significar que la firma est� falsificada.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta clave est� deshabilitada.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta clave ha caducado!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada por una firma de confianza!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "          No hay indicios de que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATENCI�N: �Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma es probablemente una FALSIFICACI�N.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada con firmas de suficiente "
 "confianza!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitida: clave p�blica ya presente\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "No ha especificado un ID de usuario (puede usar \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr "Destinatarios actuales:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5204,166 +5209,166 @@ msgstr ""
 "\n"
 "Introduzca ID de usuario. Acabe con una l�nea vac�a: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "omitida: clave p�blica ya designada como destinataria por defecto\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "Clave p�blica deshabilitada.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "omitida: clave p�blica ya establecida\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "desconocido el destinatario predefinido \"%s\"\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitida: clave p�blica deshabilitada\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "no hay direcciones v�lidas\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datos no grabados; use la opci�n \"--output\" para grabarlos\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error creando `%s': %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Firma separada.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Introduzca el nombre del fichero de datos: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "leyendo stdin...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "no hay datos firmados\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinatario an�nimo; probando clave secreta %s ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "de acuerdo, somos el destinatario an�nimo.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la antigua codificaci�n de la DEK no puede usarse\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de cifrado %d%s desconocido o desactivado\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: el cifrado %s no aparece en las preferencias del receptor\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: clave secreta %s caduc� el %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: la clave ha sido revocada"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "construcci�n del paquete fallida: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Ser� revocado por:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Este es una clave de revocaci�n confidencial)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "se fuerza salida con armadura ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet fall�: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Certificado de revocaci�n creado.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "no se encuetran claves de revocaci�n para \"%s\"\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "clave secreta \"%s\" no encontrada: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "no existe la clave p�blica correspondiente: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "�la clave p�blica y la privada no se corresponden!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de protecci�n desconocido\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: �Esta clave no est� protegida!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5382,121 +5387,121 @@ msgstr ""
 "de impresi�n de su m�quina podr�a almacenar los datos y hacerlos accesibles\n"
 "a otras personas!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor elija una raz�n para la revocaci�n:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probablemente quer�a seleccionar %d aqu�)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduzca una descripci�n opcional; ac�bela con una l�nea vac�a:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Raz�n para la revocaci�n: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(No se di� descripci�n)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 msgid "Is this okay? (y/N) "
 msgstr "�Es correcto? (s/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "las partes de la clave privada no est�n disponibles\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "el algoritmo de protecci�n %d%s no puede ser utilizado\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "el resumen protector %d no puede ser utilizado\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Frase contrase�a incorrecta; int�ntelo de nuevo."
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ... \n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "ATENCI�N: detectada clave d�bil - por favor cambie la frase contrase�a.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "generando la suma de comprobaci�n de 16 bits (desaconsejada) para \n"
 "proteger la clave secreta.\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "creada clave d�bil - reintentando\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "�imposible evitar clave d�bil para cifrado sim�trico despu�s de %d "
 "intentos!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflicto con el resumen de la firma del mensaje\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "AVISO: la subclave de firmado %s no tiene certificado cruzado\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVISO: la subclave de cifrado %s tiene un certificado cruzado inv�lido\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5504,7 +5509,7 @@ msgstr ""
 "la clave %s fue creada %lu segundo en el futuro (viaje en el tiempo\n"
 "o problemas con el reloj)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5512,51 +5517,34 @@ msgstr ""
 "la clave %s fue creada %lu segundos en el futuro (salto en el tiempo\n"
 "o problemas con el reloj)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: clave de la firma %s caducada el %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "asumiendo firma incorrecta de la clave %s por un bit cr�tico desconocido\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "clave %s: no hay subclave para la firma de revocaci�n de subclave\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "clave %s: no hay subclave para firma de subclave de enlace\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "no uede poner datos de notaci�n en claves v3 (estilo PGP 2.x)\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVISO: no puedo expandir el %% de la url de pol�tica . Se usa sin expandir.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "no puede poner URL de pol�tica en firmas v3 (estilo PGP 2.x)\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"no puede poner URL de pol�tica en firmas de claves v3 (estilo PGP 2.x)\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5564,7 +5552,7 @@ msgstr ""
 "AVISO: no puedo expandir el %% de la url de pol�tica (demasiado larga).\n"
 "Se usa sin expandir.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5573,23 +5561,23 @@ msgstr ""
 "AVISO: no puedo expandir el %% de la URL del servidor de claves\n"
 "preferido. Se usa sin expandir.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s firma de: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s�lo puede hacer firmas separadas con claves tipo PGP 2.x estando enmodo --"
 "pgp2\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5597,48 +5585,48 @@ msgstr ""
 "AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
 "preferencias del destinatario\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s�lo puede firmar en claro con claves PGP 2.x estando en modo --pgp2\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "se usar� un cifrado %s\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\" omitido: duplicado\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "omitido \"%s\": %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "omitido: clave secreta ya presente\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "�esta es una clave ElGamal generada por PGP que NO es segura para firmar!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5647,338 +5635,338 @@ msgstr ""
 "# Lista de valores de confianza asignados, creada %s\n"
 "# (Use \"gpg --import-ownertrust\" para restablecerlos)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "error en `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "l�nea demasiado larga"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "falta una coma"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "huella dactilar no v�lida"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "falta el valor de confianza"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "error econtrando registro de confianza en `%s': %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "error de lectura `%s': %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "registro base de datos de confianza %lu: escritura fallida (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "transacci�n en la base de datos de confianza demasiado grande\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "no se puede acceder a `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �el directorio no existe!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "no se puede crear el bloqueo para `%s'\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "no se puede bloquear `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: fallo en la creaci�n del registro de versi�n: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza inv�lida\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: no se puede escribir base de datos de confianza\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza inv�lida\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error actualizando el registro de versi�n: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error leyendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error escribiendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: fallo lseek: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: error lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: no es una base de datos de confianza\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de versi�n con n�mero de registro %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n del fichero %d inv�lida\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error leyendo registro libre: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error escribiendo registro de directorio: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: fallo en poner a cero un registro: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: fallo al a�adir un registro: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "La base de datos de confianza est� da�ada. Por favor, ejecute\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "no se pueden manejar l�neas de texto de m�s de %d caracteres\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "l�nea de longitud superior a %d caracteres\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' no es un identificador largo de clave v�lido\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "clave %s: aceptada como clave fiable\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "la clave %s aparece m�s de una vez en la base de datos de confianza\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "clave %s: clave fiable sin clave p�blica - omitida\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "clave %s marcada como de confianza absoluta\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confianza %lu, petici�n tipo %d: fallo lectura: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registro de confianza %lu no es del tipo requerido %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "imposible usar modelo de confianza (%d) - asumiendo el modelo %s\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "usando %s como modelo de confianza\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "13 no apto para supersticiosos"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[  revocada ]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[  caducada ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[desconocida]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[no definida]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[   dudosa  ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[   total   ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[  absoluta ]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "no definido"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "nunca"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "dudosa"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "total"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "absoluta"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "siguiente comprobaci�n de base de datos de confianza el: %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "no es necesaria una comprobaci�n de la base de datos de confianza\n"
 "con el modelo de confianza `%s'\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "no es necesario comprobar la base de datos de confianza\n"
 "con el modelo `%s'\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "clave p�blica %s no encontrada: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "por favor haga un --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d claves procesadas (%d validaciones superadas)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "no se encuentran claves absolutamente fiables\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "clave p�blica de la clave absolutamente fiable %s no encontrada\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d dudosa(s) necesarias, %d completa(s) necesarias,\n"
 "modelo de confianza %s\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5986,14 +5974,14 @@ msgstr ""
 "nivel: %d  validez: %3d  firmada: %3d  confianza: %d-, %dq, %dn, %dm, %df, %"
 "du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 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:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6008,39 +5996,39 @@ msgstr ""
 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"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "Error general"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "Formato desconocido"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "Versi�n desconocida"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "Algoritmo de clave p�blica desconocido"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "Algoritmo desconocido de resumen de mensaje"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "Clave p�blica incorrecta"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "Clave secreta incorrecta"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "Firma incorrecta"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "Error en la suma de comprobaci�n"
 
@@ -6053,15 +6041,15 @@ msgstr "Error en la suma de comprobaci�n"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "Frase contrase�a incorrecta"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "Clave p�blica no encontrada"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "Algoritmo de cifrado desconocido"
 
@@ -6075,111 +6063,111 @@ msgstr "Algoritmo de cifrado desconocido"
 # c�mo se dice llavero en ingl�s...
 # Si los ingleses dicen llavero en su idioma �por qu� no vamos a poder
 # nosotros decir lo mismo en el nuestro?
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "No se puede abrir el anillo de claves"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "paquete inv�lido"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "armadura inv�lida"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "no existe el ID de usuario"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "clave secreta no disponible"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "clave secreta incorrecta"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "no disponible"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "clave incorrecta"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "error de lectura"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "error de escritura"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "algoritmo de compresi�n desconocido"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "error al abrir fichero"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "error al crear fichero"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "frase contrase�a incorrecta"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmo de clave p�blica no implementado"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "algoritmo de cifrado no implementado"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "clase de firma desconocida"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "error en la base de datos de confianza"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "MPI incorrecto"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "l�mite de recurso"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "anillo inv�lido"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "certificado incorrecto"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "ID de usuario mal formado"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "error al cerrar fichero"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "error al renombrar fichero"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "error al borrar fichero"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "datos inesperados"
 
@@ -6187,153 +6175,167 @@ msgstr "datos inesperados"
 # Creo que es mejor "con el sello de fecha", no es un conflicto
 # del sello en si mismo sino en relaci�n con el mensaje.
 # Ok.
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "conflicto con el sello de fecha"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "algoritmo de clave p�blica no utilizable"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "el fichero existe"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "clave d�bil"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "argumento inv�lido"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "URI incorrecto"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "URI no disponible"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "error de red"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "no cifrado"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "no procesado"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "clave p�blica inutilizable"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "clave secreta inutilizable"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "error del servidor de claves"
 
-#: util/errors.c:109
+#: util/errors.c:107
 msgid "canceled"
 msgstr "cancelado"
 
-#: util/errors.c:110
+#: util/errors.c:108
 msgid "no card"
 msgstr "no hay tarjeta"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "no hay datos firmados\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr "ERROR: "
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr "ATENCION: "
 
 # bicho :-)
 # �Error simplemente?
 # Uf, preferir�a bug, si leo "error" voy a pensar en otra cosa distinta...
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... esto es un bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "ha encontrado un error... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "s�"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "fin"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "fF"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr "vale|Vale"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr "cancelar|Cancelar"
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr "vV"
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "ATENCI�N: �se est� usando memoria insegura!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "por favor, vea http://www.gnupg.org/faq.html para m�s informaci�n\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operaci�n imposible sin memoria segura inicializada\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "no uede poner datos de notaci�n en claves v3 (estilo PGP 2.x)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "no puede poner URL de pol�tica en firmas v3 (estilo PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "no puede poner URL de pol�tica en firmas de claves v3 (estilo PGP 2.x)\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
 
diff --git a/po/et.po b/po/et.po
index b1512ad74..3cfc7bce8 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -14,90 +14,90 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "v�hem kui %d bitiga ei saa algarvu genereerida\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "v�hem kui %d bitiga ei saa algarvu genereerida\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "entroopia kogumise moodul puudub\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ei �nnestu lugeda `%s' atribuute: %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ei ole tavaline fail - ignoreerin\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "m�rkus: random_seed fail on t�hi\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "`%s' ei �nnestu lugeda: %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "m�rkus: random_seed faili ei uuendatud\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "`%s' ei �nnestu kirjutada: %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "HOIATUS: kasutan ebaturvalist juhuarvude generaatorit!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -111,7 +111,7 @@ msgstr ""
 "�RGE KASUTAGE SELLE PROGRAMMI POOLT GENEREERITUD ANDMEID!!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -120,7 +120,7 @@ msgstr ""
 "Palun oodake, kogutakse entroopiat. Igavuse v�ltimiseks v�ite teha arvutiga\n"
 "mingit t��d, see t�stab ka entroopia kvaliteeti.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -131,62 +131,62 @@ msgstr ""
 "Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid t�id,\n"
 "et anda masinal v�imalust koguda enam entroopiat! (Vajatakse %d baiti)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -194,363 +194,368 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "pakend: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "vigane pakendi p�is: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "pakendi p�is: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "vigane avateksti allkirja p�is\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "pakendi p�is: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "avateksti allkirjad �ksteise sees\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "ootamatu pakend:"
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "vigane kriipsudega m�rgitud rida: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "enneaegne failil�pp (puudub CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "enneaegne failil�pp (poolik CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "vigane CRC\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC viga; %06lx - %06lx\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "enneaegne failil�pp (l�petaval real)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "viga l�petaval real\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "vigane pakend: rida on pikem, kui %d s�mbolit\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "kvooditud s�mbol pakendis - t�en�oliselt on kasutatud vigast MTA programmi\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salajane v�ti ei ole k�ttesaadav"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "unspecified"
 msgstr "P�hjus puudub"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 #, fuzzy
 msgid "not forced"
 msgstr "ei t��deldud"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -558,296 +563,296 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "list all available data"
 msgstr "V�tme leiate: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the login name"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "salajane v�ti ei ole k�ttesaadav"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Korrake parooli: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(kui te just ei m��ra v�tit s�rmej�ljega)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "pakettmoodis ei �nnestu seda teha v�tmeta \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Kustutan selle v�tme v�tmehoidlast? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "See on salajane v�ti! - kas kustutan t�esti? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "omaniku usalduse info puhastatud\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K moodi t�ttu ei saa s�mmeetrilist ESK paketti kasutada\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "kasutan �iffrit %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on t�hi fail\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "RSA v�tmeid pikkusega kuni 2048 bitti saab kr�pteerida ainult --pgp2 moodis\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "loen failist `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "k�ikide kr�pteeritavate v�tmetega ei saa IDEA �iffrit kasutada.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -855,173 +860,173 @@ msgid ""
 msgstr ""
 "pakkimise algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s kr�pteeritud andmed\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "HOIATUS: teade on kr�ptitud s�mmeetrilise �ifri n�rga v�tmega.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "probleem kr�ptitud paketi k�sitlemisel\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "mittelokaalse programmi k�ivitamist ei toetata\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "v�liste programmide k�ivitamine on blokeeritud, kuna seadete failil on\n"
 "ebaturvalised �igused\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "see platvorm n�uab v�liste programmide k�ivitamiseks ajutiste failide "
 "kasutamist\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "s�steemi viga v�lise programmi kasutamisel: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "v�line programm l�petas erandlikult\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "v�list programmi ei �nnestu k�ivitada\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "ei �nnestu lugeda v�lise programmi vastust: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "HOIATUS: ei �nnestu eemaldada ajutist kataloogi `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 "`%s' jaoks pole t�histamise v�tmeid\n"
 "\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "mittekasutatav salajane v�ti"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "v�ti %08lX: PGP 2.x stiilis v�ti - j�tsin vahele\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "HOIATUS: salajases v�tmes %08lX puudub lihtne SK kontrollsumma\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1029,128 +1034,128 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1160,51 +1165,51 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "k�si enne �lekirjutamist"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1212,7 +1217,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1232,15 +1237,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1250,7 +1255,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1258,643 +1263,643 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "�iffer: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ebaturvaliste �iguste t�ttu ei laetud �ifri laiendust \"%s\"\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Kasutaja id puudub]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "v�ta v�tmed sellest v�tmehoidlast"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "teata ajatemplite konfliktist ainult hoiatusega"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kasuta: gpgv [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1902,7 +1907,7 @@ msgstr ""
 "S�ntaks: gpg [v�tmed] [failid]\n"
 "kontrolli allkirju tuntud usaldusv��rsete v�tmetega\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1911,7 +1916,7 @@ msgstr ""
 "Teie �lesanne on sisestada n��d v��rtus; seda v��rtust ei avalikustata\n"
 "kolmandatele pooltele. Seda v��rtust on vaja et realiseerida usaldusv�rk."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1923,17 +1928,17 @@ msgstr ""
 "on teil juurdep��s ka nende salajastele v�tmetele. Kui soovite\n"
 "m��rata seda v�tit absoluutselt usaldatavaks, vastake \"jah\"\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Kui te ikkagi soovite kasutada seda mitteusaldatavat v�tit, vastake \"jah\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Sisestage kasutaja ID aadressile, kellele te soovite teadet saata."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1947,7 +1952,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1957,16 +1962,16 @@ msgstr ""
 "kr�pteerimiseks. Seda algoritmi tuleks kasutada ainult teatud piirides.\n"
 "Enne kasutamist konsulteerige palun oma turva eksperdiga."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Sisestage v�tmepikkus"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Vastake \"jah\" v�i \"ei\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1978,19 +1983,19 @@ msgstr ""
 "saa korrektset veateadet, kuna s�steem �ritab antud v��rtust\n"
 "t�lgendada vahemikuna."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Sisestage v�tmehoidja nimi"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "palun e-posti aadress, aadress ei ole kohustuslik, aga v�ga soovitav"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Te v�ite n��d sisestada kommentaari"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2004,11 +2009,11 @@ msgstr ""
 "O  et j�tkata v�tme loomist.\n"
 "V  et l�petada v�tme loomine."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Vastake \"jah\" (v�i \"j\"), kui v�ib alustada alamv�tme loomisega."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2079,12 +2084,12 @@ msgstr ""
 "\n"
 "Kui te ei tea �iget vastust, vastake \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Kui te soovite allkirjastada K�IK kasutaja IDd, vastake \"jah\""
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2092,11 +2097,11 @@ msgstr ""
 "Kui te t�esti soovite seda kasutaja IDd kustutada, vastake \"jah\".\n"
 "Sertifikaadid kustutatakse samuti!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Kui selle alamv�tme v�ib kustutada, vastake \"jah\""
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2106,7 +2111,7 @@ msgstr ""
 "kuna see allkiri v�ib olla vajalik, et kirjeldada antud v�tme v�i\n"
 "antud v�tmega sertifitseeritud teise v�tme usaldatavust."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2118,13 +2123,13 @@ msgstr ""
 "kasutab, sest see v�ti v�ib moodustada usaldussuhte l�bi m�ne juba\n"
 "sertifitseeritud v�tme."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Allkiri ei ole kehtiv. Oleks m�istlik see v�tmehoidlast kustutada."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2138,7 +2143,7 @@ msgstr ""
 "vaid siis, kui see allkiri ei ole miskip�rast kehtiv ja on\n"
 "olemas ka teine allkiri, mis kasutajat v�tmega seob."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2148,23 +2153,23 @@ msgstr ""
 "vastavaks hetkel m��ratud seadetele. K�ikide asjasse puutuvate\n"
 "ise loodud allkirjade ajatempleid suurendatakse �he sekundi v�rra.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Palun korrake parooli, siis saate oma kirjutatus kindel olla."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Sisestage palun failinimi, mida allkirjastada"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Vastake \"jah\", kui faili v�ib �le kirjutada"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2172,7 +2177,7 @@ msgstr ""
 "Palun sisestage uus failinimi. Kui te vajutate lihtsalt reavahetust,\n"
 "kasutatakse vaikimisi faili (nimi on nurksulgudes)."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2201,7 +2206,7 @@ msgstr ""
 "      kasutama; seda kasutatakse tavaliselt m�rkimaks vigast e-posti "
 "aadressi.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2211,535 +2216,535 @@ msgstr ""
 "soovite seda t�histamise sertifikaati esitada. Palun kirjutage\n"
 "l�hidalt. T�hi rida l�petab teksti.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Abiinfo puudub"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s' kohta abiinfo puudub"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "mittekasutatav salajane v�ti"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "j�tan bloki t��biga %d vahele\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu v�tit on seni t��deldud\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "T��deldud kokku: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " vahele j�etud uusi v�tmeid: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    puudub kasutaja ID: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "            imporditud: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              muutmata: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       uusi kasutajaid: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      uusi alamv�tmeid: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      uusi t�histamisi: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " loetud salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " salajasi v�tmeid imporditud: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muutmata salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       pole imporditud: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " loetud salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "v�ti %08lX: avalik v�ti \"%s\" on imporditud\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "v�ti %08lX: ei �nnestu lugeda algset v�tmeblokki: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus kasutaja ID\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti vigase �ifriga %d - j�tsin vahele\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "v�ti %08lX: on juba salajaste v�tmete hoidlas\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm kasutajaga \"%s\"\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "v�ti %08lX: vigane alamv�tme seos\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "v�ti %08lX: v�tme t�histamiseks puudub alamv�ti\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "v�ti %08lX: eemaldasin mitme alamv�tme t�histamise\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "v�tmehoidla `%s' on loodud\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[t�histamine]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 halb allkiri\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d halba allkirja\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allkiri j�i testimata, kuna v�ti puudub\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d allkirja j�i testimata, kuna v�tmed puuduvad\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "tuvastasin �he kehtiva iseenda allkirjata kasutaja ID\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2752,63 +2757,63 @@ msgstr ""
 "passe, kontrollige erinevatest allikatest n�puj�lgi...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Usaldan v�hesel m��ral\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Usaldan t�iesti\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kasutaja ID \"%s\" on aegunud."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2817,11 +2822,11 @@ msgstr ""
 "Iseenda allkiri \"%s\"\n"
 "on PGP 2.x stiilis allkiri.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2830,11 +2835,11 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on aegunud.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2843,54 +2848,54 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks? (j/E) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" on juba lokaalselt allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "V�tmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "See v�ti on aegunud!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "See v�ti aegub %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "--pgp2 moodis ei saa PGP 2.x v�tmele OpenPGP allkirja anda.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "See muudab v�tme PGP 2.x programmidega mitte-kasutatavaks.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2900,32 +2905,32 @@ msgstr ""
 "kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
 "sisestage \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ma ei ole �ldse kontrollinud.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ma olen kontrollinud v�ga hoolikalt.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2934,100 +2939,100 @@ msgstr ""
 "Olete t�esti kindel, et soovite seda v�tit oma\n"
 "v�tmega allkirjastada: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "See saab olema iseenda allkiri.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Ma ei ole seda v�tit �ldse kontrollinud.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Seda v�tit ei �nnestu toimetada: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3035,11 +3040,11 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3047,206 +3052,206 @@ msgstr ""
 "Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Kas te t�esti soovite seda teha? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "t�stan v�tme allkirja �igesse kohta\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "n�ita v�tit ja kasutaja IDd"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "t�hista allkirjad"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "kustuta kasutaja ID"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "kustuta sekundaarne v�ti"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "lisa t�histamise v�ti"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "m�rgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "n�ita eelistusi (ekspert)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "n�ita eelistusi (detailsena)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "t�hista kasutaja ID"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "enable key"
 msgstr "luba v�ti"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "disable key"
 msgstr "blokeeri v�ti"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "n�ita foto ID"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Salajane v�ti on kasutatav.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3254,241 +3259,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "V�ti on t�histatud."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tundmatu allkirja klass"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "See k�sklus ei ole %s moodis lubatud.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit kustutada? "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Kas t�histan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Teatel�hend: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr "Noteering: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3496,19 +3501,19 @@ msgstr ""
 "Tuleb t�hele panna et kuni te pole programmi uuesti k�ivitanud, ei pruugi\n"
 "n�idatud v�tme kehtivus olla tingimata korrektne.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3516,7 +3521,7 @@ msgstr ""
 "HOIATUS: �htegi kasutaja ID pole m�rgitud primaarseks.  See k�sklus v�ib\n"
 "              p�hjustada muu kasutaja ID primaarseks m��ramist.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3525,75 +3530,75 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
 "         PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Foto IDd ei saa PGP2 v�tmele lisada.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3602,370 +3607,370 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. M��ratud t�histaja lisamine v�ib\n"
 "         p�hjustada m�ningaid PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x-stiili v�tmele ei saa m��ratud t�histajat lisada.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "te ei saa nimetada v�tit iseenda m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "HOIATUS: v�tme seadmist m��ratud t�histajaks ei saa tagasi v�tta!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "HOIATUS: allkirjastamise alamv�ti %08lX ei ole rist-sertifitseeritud\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "j�tan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Kirjutan �le (j/E)? "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka t�histada? (j/E) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "N�itan %s foto IDd suurusega %ld, v�ti 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "kirjutan otsese allkirja\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "kirjutan v�tit siduva allkirja\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane v�tme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 #, fuzzy
 msgid "Encrypt"
 msgstr "kr�pteeri andmed"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Millist v�tmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud v�tmepikkus on %u bitti\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3981,7 +3986,7 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3997,40 +4002,40 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4038,12 +4043,12 @@ msgstr ""
 "Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
 "Siiski k�sitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 #, fuzzy
 msgid ""
 "\n"
@@ -4059,44 +4064,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4107,7 +4112,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 
@@ -4122,23 +4127,23 @@ msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4146,12 +4151,12 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4163,7 +4168,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4175,50 +4180,50 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4228,711 +4233,711 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "M�RKUS: v3 v�tmetele alamv�tmete loomine ei ole OpenPGP �hilduv\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon t�esti? "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "mitte kunagi"
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Kriitiline allkirja poliitika: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Allkirja poliitika: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Kriitiline allkirja noteerimine: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "V�tmehoidla"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "    Alamv�tme s�rmej�lg:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr " Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "     Alamv�tme s�rmej�lg:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     V�tme s�rmej�lg ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "HOIATUS: on olemas 2 faili konfidentsiaalse infoga.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ei ole muudetud\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s on uus\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Palun parandage see v�imalik turvaprobleem\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrollin v�tmehoidlat `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: v�tmehoidla on loodud\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, 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:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kr�pteeritud sessiooni v�ti\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "avalik v�ti on %08lX\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku v�tmega kr�pteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kr�pteeritud %s v�tmega, ID %08lX\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku v�tmega lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "kr�pteeritud kasutades %lu parooli\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "kr�pteeritud �he parooliga\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s kr�pteeritud andmeid\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "lahtikr�pteerimine �nnestus\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "HOIATUS: teate koosk�lalisus ei ole tagatud\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll j�eti �ra\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neid allkirju ei �nnestu t��delda\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "V�tme leiate: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "binaarne"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "tundmatu"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
 
-#: g10/mainproc.c:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ei �nnestu blokeerida m�lupildi salvestamist: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "realiseerimata �ifri algoritm"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA �ifri lisandprogrammi pole\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = esita palun t�iendavat infot\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ebasoovitav v�ti \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "palun kasutage selle asemel \"%s%s\"\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "Pakkimata"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Pakkimata"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fail `%s' on olemas. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Kirjutan �le (j/E)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: tundmatu suffiks\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Sisestage uus failinimi"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "kirjutan standardv�ljundisse\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "eeldan allkirjastatud andmeid failis `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "uus omaduste fail `%s' on loodud\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, 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"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "HOIATUS: t�en�oliselt ebaturvaline s�mmeetriliselt kr�pteeritud sessiooni "
 "v�ti\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probleem agendiga - blokeerin agendi kasutamise\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (peamise v�tme ID %08lX)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4943,28 +4948,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Korrake parooli\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Sisestage parool\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "pakettmoodis ei saa parooli k�sida\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Sisestage parool: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4974,21 +4979,21 @@ msgstr ""
 "Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
 "parooli: \""
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Korrake parooli: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5002,162 +5007,162 @@ msgstr ""
 "v�ga suurt pilti, on ka k�ti v�ha suur!\n"
 "M�istlik pildi suurus v�iks olla umbes 240x288.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Sisestage foto ID jaoks JPEG faili nimi: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\": ei ole JPEG fail\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "On see foto �ige (j/E/v)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "foto ID ei saa n�idata!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "P�hjus puudub"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "V�ti on asendatud"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "V�ti on kompromiteeritud"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "V�ti ei ole enam kasutusel"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "Kasutaja ID ei ole enam kehtiv"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "t�histamise p�hjus: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "t�histamise kommentaar: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iItTvVjJ"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Usalduse v��rtus puudub:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "See v�ti kuulub t�en�oliselt omanikule\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Ei tea\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = EI usalda\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Usaldan absoluutselt\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " t = tagasi p�himen��sse\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " j = j�ta see v�ti vahele\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " v = v�lju\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Teie otsus? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit absoluutselt usaldada? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Sertifikaadid t�iesti usaldatava v�tmeni:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%08lX: Ei ole midagi, mis n�itaks, et see v�ti kuulub omanikule\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%08lX: Ei ole midagi, mis n�itaks, et see v�ti kuulub omanikule\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "See v�ti kuulub t�en�oliselt omanikule\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "See v�ti kuulub meile\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5169,109 +5174,109 @@ msgstr ""
 "v�ite j�rgnevale k�simusele vastata jaatavalt\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Kasutan seda v�tit ikka? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "HOIATUS: Kasutan mitteusaldatavat v�tit!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "HOIATUS: see v�ti v�ib olla t�histatud (t�histamise v�tit pole)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "HOIATUS: See v�ti on omaniku poolt t�histatud!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         See v�ib t�hendada, et allkiri on v�ltsing.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "HOIATUS: See alamv�ti on omaniku poolt t�histatud!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "M�rkus: See v�ti on blokeeritud.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "M�rkus: See v�ti on aegunud!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "HOIATUS: Seda v�tit ei ole sertifitseeritud usaldatava allkirjaga!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Ei ole midagi, mis n�itaks, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "HOIATUS: Me EI usalda seda v�tit!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Allkiri on t�en�oliselt V�LTSING.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "HOIATUS: Seda v�tit ei ole sertifitseeritud piisavalt usaldatava "
 "allkirjaga!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ei ole kindel, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Te ei m��ranud kasutaja IDd. (v�ite kasutada v�tit \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5279,170 +5284,170 @@ msgstr ""
 "\n"
 "Sisestage kasutaja ID.  L�petage t�hja reaga: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Tundmatu kasutaja ID.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "j�tsin vahele: avalik v�ti on juba vaikimisi saaja\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "Avalik v�ti on blokeeritud.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "andmeid ei salvestatud; salvestamiseks kasutage v�tit \"--output\"\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Eraldiseisev allkiri.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Palun sisestage andmefaili nimi: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "loen standardsisendit ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "allkirjastatud andmeid pole\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anon��mne saaja; proovin salajast v�tit %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, me oleme anon��mne teate saaja.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vana DEK kodeerimine ei ole toetatud\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifri algoritm %d%s on tundmatu v�i blokeeritud\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "M�RKUS: �ifri algoritm %d puudub eelistustes\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "M�RKUS: v�ti on t�histatud"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet eba�nnestus: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "T�histaja:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(See on tundlik t�histamise v�ti)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "V�ljundis sunnitakse kasutama ASCII vormingut.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet eba�nnestus: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "T�histamise sertifikaat on loodud.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 "`%s' jaoks pole t�histamise v�tmeid\n"
 "\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salajast v�tit `%s' ei leitud: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "M�RKUS: See v�ti ei ole kaitstud!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5463,174 +5468,158 @@ msgstr ""
 "tr�kis�steem\n"
 "v�ib salvestada need andmed ja teha teistele k�ttesaadavaks! \n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(T�en�oliselt soovite siin valida %d)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Sisestage mittekohustuslik kirjeldus. L�petage t�hja reaga:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "T�histamise p�hjus: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "On see h�sti? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Vigane parool; palun proovige uuesti"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "HOIATUS: Tuvastasin n�rga v�tme - palun muutke uuesti parooli.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "loon salajase v�tme kaitseks mittesoovitavat 16 bitist kontrollsummat\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "loodi n�rk v�ti - proovin uuesti\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "s�mmeetrilises �ifris ei �nnestu v�ltida n�rga v�tme kasutamist; proovisin %"
 "d korda!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "HOIATUS: allkirja l�hend on teatega konfliktne\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "HOIATUS: allkirjastamise alamv�ti %08lX ei ole rist-sertifitseeritud\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "HOIATUS: allkirjastamise alamv�tmel %08lX on vigane rist-sertifikaat\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "avalik v�ti %08lX on %lu sekundit uuem, kui allkiri\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "M�RKUS: allkirja v�ti %08lX aegus %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "eeldan tundmatu kriitilise biti t�ttu v�tmel %08lX vigast allkirja\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "v�ti %08lX: alamv�tme t�histamise paketile puudub alamv�ti\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "v�ti %08lX: alamv�tme allkirjaga sidumiseks puudub alamv�ti\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) allkirja lisada\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) v�tme allkirja lisada\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "HOIATUS: noteerimise %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "poliisi URLi ei saa v3 (PGP 2.x) allkirjadesse panna\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "poliisi URLi ei saa v3 v�tme (PGP 2.x) allkirjadesse panna\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5638,7 +5627,7 @@ msgstr ""
 "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5647,74 +5636,74 @@ msgstr ""
 "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s allkiri kasutajalt: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab eraldi-allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab avateksti allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s kr�pteerimist\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "v�ti ei ole m�rgitud ebaturvaliseks - sellega ei saa v�lts RNGd kasutada!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "`%s' j�tsin vahele: duplikaat\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "`%s' j�tsin vahele: %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "j�tsin `%s' vahele: see on PGP genereeritud ElGamal v�ti,\n"
 "mis ei ole allkirjades kasutamiseks turvaline!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5723,347 +5712,347 @@ msgstr ""
 "# Omistatud usalduse v��rtuste loend, loodud: %s\n"
 "# (Taastamiseks kasutage \"gpg --import-ownertrust\")\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "rida on liiga pikk\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "impordi usalduse v��rtused"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "viga usalduse kirje otsimisel: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "viga lugemisel: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync eba�nnestus: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb kirje %lu: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "trustdb transaktsioon on liiga suur\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: kataloogi ei ole!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versioonikirje loomine ei �nnestu: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: loodi vigane usalduse andmebaas\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb on loodud\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "M�RKUS: trustdb pole kirjutatav\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: vigane trustdb\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: viga versioonikirje uuendamisel: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: viga versioonikirje lugemisel: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb fail\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versioonikirje kirje numbriga %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vigane faili versioon %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kirje nullimine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kirje lisamine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb on vigane; palun k�ivitage \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "ei suuda k�sitleda tekstiridu mis on pikemad, kui %d s�mbolit\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "sisendrida on pikem, kui %d s�mbolit\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' ei ole kehtiv pikk v�tmeID\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "v�ti %08lX: aktsepteerin usaldusv��rse v�tmena\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "v�ti %08lX esineb trustdb failis enam kui korra\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "v�ti %08lX: usaldataval v�tmel pole avalikku v�tit - j�tsin vahele\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "v�ti on m�rgitud abslouutselt usaldatuks.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "usalduse kirje %lu, p�ringu t��p %d: lugemine eba�nnestus: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "usalduse kirje %lu ei oma soovitud t��pi %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[t�histatud] "
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[aegunud] "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tundmatu"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "mitte kunagi"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb j�rgmine kontroll %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ei leia avalikku v�tit %08lX: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "palun tehke --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "absoluutselt usaldatavaid v�tmeid pole\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 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:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6078,309 +6067,322 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "sisendrida %u on liiga pikk v�i seavahetus puudub\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "�ldine viga"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "tundmatu paketi t��p"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "tundmatu versioon"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "tundmatu avaliku v�tme algoritm"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "tundmatu l�hendi algoritm"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "halb avalik v�ti"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "halb salajane v�ti"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "halb allkiri"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "kontrollsumma viga"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "halb parool"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "ei leia avalikku v�tit"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "tundmatu �ifri algoritm"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "v�tmehoidlat ei �nnestu avada"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "vigane pakett"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "vigane pakend"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "sellist kasutaja id pole"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "salajane v�ti ei ole k�ttesaadav"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "kasutati valet salajast v�tit"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "ei ole toetatud"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "halb v�ti"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "viga faili lugemisel"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "viga faili kirjutamisel"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "tundmatu pakkimisalgoritm"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "viga faili avamisel"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "viga faili loomisel"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "vigane parool"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "realiseerimata avaliku v�tme algoritm"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "realiseerimata �ifri algoritm"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "tundmatu allkirja klass"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "usalduse andmebaasi viga"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "halb MPI"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "ressursi limiit"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "vigane v�tmehoidla"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "halb sertifikaat"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "vigane kasutaja id"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "viga faili sulgemisel"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "viga faili �mber nimetamisel"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "viga faili kustutamisel"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "ootamatud andmed"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "ajatemplite konflikt"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "mittekasutatav avaliku v�tme algoritm"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "fail on olemas"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "n�rk v�ti"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "vigane argument"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "halb URI"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "mittetoetatud URI"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "v�rgu viga"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "kr�ptimata"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "ei t��deldud"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "mittekasutatav avalik v�ti"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "mittekasutatav salajane v�ti"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "v�tmeserveri viga"
 
-#: util/errors.c:109
+#: util/errors.c:107
 #, fuzzy
 msgid "canceled"
 msgstr "Katkesta"
 
-#: util/errors.c:110
+#: util/errors.c:108
 #, fuzzy
 msgid "no card"
 msgstr "kr�ptimata"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "allkirjastatud andmeid pole\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... see on viga (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "te leidsite vea ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "jah"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "ei"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "eE"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "v�lju"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "vV"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "HOIATUS: kasutan ebaturvalist m�lu!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "Lisainfot leiate lehelt http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "initsialiseerimata turvalise m�luta ei ole operatsioon v�imalik\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) allkirja lisada\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "noteerimise infot ei saa v3 (PGP 2.x stiilis) v�tme allkirja lisada\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "poliisi URLi ei saa v3 (PGP 2.x) allkirjadesse panna\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr "poliisi URLi ei saa v3 v�tme (PGP 2.x) allkirjadesse panna\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA n�uab 160 bitist r�sialgoritmi kasutamist\n"
 
diff --git a/po/fi.po b/po/fi.po
index c7170f32a..1f612ca28 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -30,91 +30,91 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "alkulukua, jossa on alle %d bittiä, ei voi luoda\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "alkulukua, jossa on alle %d bittiä, ei voi luoda\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "entropian keräysmoduulia ei havaittu\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "tiedoston \"%s\" tilaa ei voi lukea: %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" on erikoistiedosto - ohitettiin\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "huom: random_seed-tiedosto on tyhjä\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "VAROITUS: random_seed-tiedosto on väärän kokoinen - tiedostoa ei käytetä\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi lukea: %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "huom: random_seed-tiedostoa ei päivitetty\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "tiedostoon \"%s\" ei voi kirjoittaa: %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROITUS: käytetty satunnaislukugeneraattori ei ole turvallinen.\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -127,7 +127,7 @@ msgstr ""
 "\n"
 "ÄLÄ KÄYTÄ OHJELMAN TUOTTAMAA DATAA!!\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -137,7 +137,7 @@ msgstr ""
 "estäisi sinua pitkästymästä.  Se nimittäin samalla parantaa entropian "
 "laatua.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -149,62 +149,62 @@ msgstr ""
 "antaaksesi käyttöjärjestelmälle mahdollisuuden kerätä lisää entropiaa! \n"
 "(Vielä tarvitaan %d tavua)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -212,189 +212,194 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 #, fuzzy
 msgid "generating new key\n"
 msgstr "luo uusi avainpari"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "ascii-koodaus: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "epäkelpo ascii-koodausotsake: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "ascii-koodausotsake: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "epäkelpo selkotekstisen allekirjoituksen otsikko\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "ascii-koodausotsake: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "sisäkkäisiä tekstimuotoisia allekirjoituksia\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "odottamaton ascii-koodaus:"
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "epäkelpo viiva rivin lopussa: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "ennenaikainen tiedoston loppu (ei CRC:tä)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "ennenaikainen tiedoston loppu (CRC:ssä)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "väärinmuotoiltu CRC\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-virhe; %06lx - %06lx\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "Ennenaikainen tiedoston loppu (Trailerissa)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "virhe trailer-rivissä\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "epäkelpo ascii-koodaus: yli %d merkkiä pitkä rivi\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -402,176 +407,176 @@ msgstr ""
 "viallista\n"
 "MTA:ta on käytetty\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salaista avainta ei löydy"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Valintasi? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "unspecified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 #, fuzzy
 msgid "not forced"
 msgstr "ei käsitelty"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 #, fuzzy
 msgid "Language preferences: "
 msgstr "päivitä valinnat"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -579,468 +584,468 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Komento> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "salaista avainta ei löydy"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Toista salasana: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(ellet määritä avainta sormenjäljen perusteella)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "ei onnistu eräajossa ilman \"--yes\"-valitsinta\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Poista tämä avain avainrenkaasta? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Tämä on salainen avain! - poista varmasti? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "luottamustiedot pyyhitty\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "julkiselle avaimelle \"%s\" löytyy vastaava salainen avain!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "symmetristä ESK-pakettia ei voi käyttää S2K-tilan vuoksi\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "käytetään salakirjoitusalgoritmia %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "--pgp2-tilassa voidaan salata korkeintaan 2048-bittisillä RSA-avaimilla\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "luetaan kohteesta \"%s\"\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "kaikille salattaville avaimille ei voi käyttää IDEA-salainta.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "valittu pakkausalgoritmi %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s salattua dataa\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VAROITUS: viesti salattiin symmetrisessä salaimessa \n"
 "esiintyvällä heikolla avaimella.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "ongelma käsiteltäessä salattua pakettia\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "etäohjelman suorittamista ei tueta\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "ulkoisen ohjelman kutsuminen poistettu käytöstä johtuen turvattomista \n"
 "asetustiedoston oikeuksista\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "tämä ympäristö vaatii väliaikaistiedoston kutsuttaessa ulkoisia ohjelmia\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "järjestelmävirhe kutsuttaessa ulkoista ohjelmaa: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "ulkoisen ohjelman luonnoton päättyminen\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "ulkoista ohjelmaa ei voi suorittaa\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "ulkoisen ohjelman vastausta ei voi lukea: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROITUS: väliaikaishakemistoa \"%s\" ei voi poistaa: %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "salaista avainta ei voi käyttää"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "avain %08lX: ei suojattu - ohitetaan\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "VAROITUS: salaisella avaimella %08lX ei ole yksinkertaista SK-"
 "tarkistussummaa\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "VAROITUS: mitään ei viety\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1048,128 +1053,128 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[tiedosto]|tee allekirjoitus"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "näytä avaimet"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "näytä avaimet allekirjoituksineen"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1179,51 +1184,51 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "käytä tulostustiedostona"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "monisanainen"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1232,7 +1237,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1251,16 +1256,16 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1270,7 +1275,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1278,646 +1283,646 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth tulee olla välillä 1-255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk-välimuistissa on liian monta kohdetta - poistettu käytöstä\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Käyttäjätunnusta ei löytynyt]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "ota avaimet tästä avainrenkaasta"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1925,7 +1930,7 @@ msgstr ""
 "Käyttö: gpg [valitsimet] [tiedostot]\n"
 "Tarkista allekirjoituksia tunnetuille luotetuille avaimille\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1936,7 +1941,7 @@ msgstr ""
 "luottamusverkko eikä sillä ei ole mitään tekemistä (epäsuorasti luotujen) \n"
 "varmenneverkkojen kanssa."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1948,18 +1953,18 @@ msgstr ""
 "salainen \n"
 "pari on sinulla.  Vastaa \"kyllä\" luottaaksesi tähän avaimeen ehdoitta\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Vastaa \"kyllä\" jos haluat kaikesta huolimatta käyttää tätä epäluotettavaa\n"
 "avainta."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Syötä vastaanottajan, jolle haluat lähettää viestin, käyttäjätunnus."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1973,7 +1978,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1984,16 +1989,16 @@ msgstr ""
 "ympäristöissä.\n"
 "Ole hyvä ja kysy tietoturva-asiantuntijaltasi ensin"
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Syötä avaimen koko"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Vastaa \"kyllä\" tai \" ei\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2005,19 +2010,19 @@ msgstr ""
 "mutta sen seurauksena et saa kunnollista virheilmoitusta \n"
 "vaan järjestelmä yrittää tulkita arvon aikajaksona."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Anna avaimen haltijan nimi"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "anna vapaaehtoinen, mutta erittäin suositeltava sähköpostiosoite"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Kirjoita vapaaehtoinen huomautus"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2031,11 +2036,11 @@ msgstr ""
 "O   jatka avaimen luomista\n"
 "L   lopeta"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Vastaa \"kyllä\" (tai vain \"k\") jos haluat luoda aliavaimen."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2106,12 +2111,12 @@ msgstr ""
 "\n"
 "Jos et tiedä mikä olisi sopiva vastaus, vastaa \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Vastaa \"kyllä\" jos haluat allekirjoittaa KAIKKI käyttäjätunnukset"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2119,11 +2124,11 @@ msgstr ""
 "Vastaa \"kyllä\", jos haluat poistaa tämän käyttäjätunnuksen.\n"
 "Menetät samalla kaikki siihen liittyvät varmenteet!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Vastaa \"kyllä\", jos aliavaimen voi poistaa"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2134,7 +2139,7 @@ msgstr ""
 "luottamussuhteen luomiseksi avaimeen tai johonkin toiseen tämän avaimen\n"
 "varmentamaan avaimeen."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2147,7 +2152,7 @@ msgstr ""
 "avain saattaa luoda luottamusketjun toisen, jo ennalta \n"
 "varmennetun avaimen kautta."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2155,7 +2160,7 @@ msgstr ""
 "Allekirjoitus ei ole pätevä.  Järkevintä olisi poistaa se \n"
 "avainrenkaastasi."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2169,7 +2174,7 @@ msgstr ""
 "allekirjoitus vain, jos se ei ole jostain syystä pätevä, ja \n"
 "avaimella on jo toinen allekirjoitus."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2179,23 +2184,23 @@ msgstr ""
 "nykyiseen luetteloon valinnoista.  Kaikkien muutettujen\n"
 "oma-allekirjoitusten aikaleima siirretään yhdellä sekunnilla eteenpäin.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Toista edellinen salasanasi varmistuaksesi siitä, mitä kirjoitit."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Anna allekirjoitetun tiedoston nimi"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Vastaa \"kyllä\", jos tiedoston voi ylikirjoittaa"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2203,7 +2208,7 @@ msgstr ""
 "Syötä uusi tiedostonimi. Jos painat vain RETURN, käytetään\n"
 "oletustiedostoa (joka näkyy sulkeissa)."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2232,7 +2237,7 @@ msgstr ""
 "      tätä normaalisti käytetään merkitsemään sähköpostiosoite "
 "vanhenneeksi.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2242,539 +2247,539 @@ msgstr ""
 "mitätöintivarmenteen.  Kirjoita lyhyesti.\n"
 "Tyhjä rivi päättää tekstin.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Ei ohjeita saatavilla"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Ei ohjetta aiheesta \"%s\""
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "salaista avainta ei voi käyttää"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ohitetaan tyypin %d lohko\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "tähän mennessä käsitelty %lu avainta\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Kaikkiaan käsitelty: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ohitetaan uudet avaimet: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ilman käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "              tuotu: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             muuttamatonta: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          uusia käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           uusia aliavaimia: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        uusia allekirjoituksia: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   uusia avainten mitätöintejä: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  tuotuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muuttamattomia salaisia avaimia: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ei tuotu: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        uusia allekirjoituksia: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/import.c:620
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "avain %08lX: uusi avain - ohitetaan\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "avain %08lX: \"%s\" ei muutoksia\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "avain %08lX: salainen avain tuotu\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "avain %08lX: avain on jo avainrenkaassa\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "avain %08lX: salaista avainta ei löydy: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "avain %08lX: epäkelpo oma-allekirjoitus käyttäjätunnuksella \"%s\"\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "avain %08lX: ei aliavainta avainten mitätöintiä varten\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "avain %08lX: käyttäjätunnus ohitettu '"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "avain %08lX: aliavain ohitettu\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "avain %08lX: mitätöintivarmenne väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "avain %08lX: epäkelpo mitätöintivarmenne: %s - ohitetaan\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
 "ei saatavilla.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "avainrengas \"%s\" luotu\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[mitätöinti]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[oma-allekirjoitus]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 väärä allekirjoitus\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d väärää allekirjoitusta\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d allekirjoitusta jätetty tarkistamatta puuttuvien avainten vuoksi\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allekirjoitusta jätetty tarkistamatta virheiden vuoksi\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "havaittiin 1 käyttäjätunnus ilman voimassaolevaa oma-allekirjoitusta\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "havaittiin %d käyttäjätunnusta ilman voimassaolevaa oma-allekirjoitusta\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2787,63 +2792,63 @@ msgstr ""
 "lähteistä...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Luotan osittain\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Luotan täysin\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  Allekirjoittaminen ei onnistu.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2852,13 +2857,13 @@ msgstr ""
 "Oma-allekirjoitus kohteessa \"%s\"\n"
 "on PGP 2.x -muodon allekirjoitus.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen täysin vientikelpoiseksi OpenPGP-allekirjoitukseksi? "
 "(k/E) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2867,11 +2872,11 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on vanhentunut.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Haluatko tehdä uuden allekirjoituksen korvaamaan vanhentuneen? (k/E) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2880,55 +2885,55 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on paikallinen allekirjoitus.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen täysin vientikelpoiseksi allekirjoitukseksi? (k/E) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu paikallisesti avaimella %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Tämä avain on vanhentunut!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Avain vanhenee %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Haluatko allekirjoituksesi vanhenevan samaan aikaan? (K/e) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Et voi luoda OpenPGP-allekirjoitusta PGP 2.x -avaimella --pgp2-tilassa.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Tämä tekisi avaimesta käyttökelvottoman PGP 2.x:lle.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2937,32 +2942,32 @@ msgstr ""
 "Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
 "Jos et tiedä vastausta, syötä \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) En vastaa.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) En ole tarkistanut lainkaan.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Olen suorittanut arkisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2971,100 +2976,100 @@ msgstr ""
 "Haluatko varmasti allekirjoittaa tämän avaimen\n"
 "omalla avaimellasi: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Tämä tulee olemaan oma-allekirjoitus.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "VAROITUS: Tätä allekirjoitusta ei määritellä vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "VAROITUS: Tätä allekirjoitusta ei määritellä mitätöimättömäksi.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "En ole tarkistanut tätä avainta lainkaan.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen arkisesti.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen erittäin huolellisesti.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Avainta ei ole suojattu.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "Avain on suojattu.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ei voi muokata avainta: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3072,11 +3077,11 @@ msgstr ""
 "Syötä uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3084,206 +3089,206 @@ msgstr ""
 "Et halua salasanaa - tämä on todennäköisesti *huono* ajatus!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Haluatko varmasti tehdä tämän? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "tallenna ja lopeta"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "näytä avaimet ja käyttäjätunnukset"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "mitätöi allekirjoitus"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "lisää käyttäjätunnus"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "lisää valokuva"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "poista käyttäjätunnus"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "poista toissijainen avain"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "lisää mitätöintiavain"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "merkitse käyttäjätunnus ensisijaiseksi"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "vaihda salaisten ja julkisten avainten luettelon välillä"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "näytä valinnat (asiantuntija)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "näytä valinnat (monisanaisesti)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "muuta luottamusastetta"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "mitätöi käyttäjätunnus"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "enable key"
 msgstr "ota avain käyttöön"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "disable key"
 msgstr "poista avain käytöstä"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "näytä valokuvatunniste"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Salainen avain on saatavilla.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Tähän tarvitaan salainen avain.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Käytä ensin komentoa \"toggle\".\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3291,241 +3296,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "Avain on mitätöity."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tuntematon allekirjoitusluokka"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Haluatko varmasti poistaa tämän avaimen? "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "näytä valinnat"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Varmastiko päivitä valinnat? "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Tallenna muutokset? "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaatio: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3533,19 +3538,19 @@ msgstr ""
 "Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n"
 "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3553,7 +3558,7 @@ msgstr ""
 "VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi.  Tämän \n"
 "komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3562,75 +3567,75 @@ msgstr ""
 "VAROITUS: Tämä on PGP2-muodon avain.  Valokuvan lisääminen voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3640,374 +3645,374 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   %08lX allekirjoitti tämän %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   %08lX mitätöi tämän %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VAROITUS: käyttäjätunnuksen allekirjoitus on päivätty %d sekuntin päähän "
 "tulevaisuuteen\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Näytetään valokuva %s, kokoa %ld avaimelle 0x%08lX\n"
 "(käyttäjätunnus %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "kirjoitetaan suora allekirjoitus\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "kirjoitetaan oma-allekirjoitus\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 #, fuzzy
 msgid "Encrypt"
 msgstr "salaa tiedot"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-avainparissa on 1024 bittiä.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Halutun avaimen koko on %u bittiä\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4023,7 +4028,7 @@ msgstr ""
 "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
 "     <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4039,40 +4044,40 @@ msgstr ""
 "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4080,12 +4085,12 @@ msgstr ""
 "Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n"
 "Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 #, fuzzy
 msgid ""
 "\n"
@@ -4103,44 +4108,44 @@ msgstr ""
 "     \"Matti Meikäläinen (nuorempi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei voi alkaa numerolla\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Käytät merkistöä \"%s\".\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4151,7 +4156,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 
@@ -4166,23 +4171,23 @@ msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4190,12 +4195,12 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4207,7 +4212,7 @@ msgstr ""
 "tämän ohjelman valitsimella \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4219,50 +4224,50 @@ msgstr ""
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4271,12 +4276,12 @@ msgstr ""
 "Huomaa, että tätä avainta ei voida käyttää salaamiseen.  Käytä komentoa\n"
 "\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4284,7 +4289,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4292,703 +4297,703 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "ei koskaan"
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Kriittinen allekirjoituskäytäntö: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Allekirjoituskäytäntö: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Kriittinen allekirjoitusnotaatio: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Avainrengas"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "     Aliavaimen sormenjälki:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr " Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "      Aliavaimen sormenjälki:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Avaimen sormenjälki ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROITUS: löytyi 2 tiedostoa, joissa on luottamuksellisia tietoja.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s säilyi muuttumattomana\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s on uusi\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Ole hyvä ja korjaa tämä mahdollinen tietoturvareikä\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "tarkistetaan avainrengasta \"%s\"\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: avainrengas luotu\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
 "ajossa\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "outo koko salatulle istuntoavaimelle (%d)\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-salattu istuntoavain\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "julkinen avain on %08lX\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "salattu %s-avaimella, tunnus %08lX\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "julkisen avaimen avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "salattu %lu salasanalla\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "salattu yhdellä salasanalla\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "oletettavasti %s-salattua dataa\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "avaus onnistui\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROITUS: salattua viestiä on muokattu!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "HUOM: lähettäjä määrittää \"vain-sinun-silmillesi\"\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 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:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "näitä allekirjoituksia ei voi käsitellä\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vanhentunut allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[ei tiedossa]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, 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:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "binääri"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "tuntematon "
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole erillinen\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 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:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-tiedostojen luontia ei voi estää: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "salausalgoritmi ei ole käytössä"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA-salaimen liitännäinen ei käytettävissä\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = näytä lisätietoja\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s ei kenties voi käsitellä tätä viestiä\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Tiedosto \"%s\" on olemassa."
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: tuntematon pääte\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Syötä uusi tiedostonimi"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "kirjoitetaan vakiotulosteeseen\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "data kohteessa \"%s\" oletetaan allekirjoitetuksi\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "uusi asetustiedosto \"%s\" luotu\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
 "ajossa\n"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "agentin käytössä on ongelmia - agenttia ei käytetä\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (pääavaimen tunnus %08lX)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4999,28 +5004,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Toista salasana\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Syötä salasana\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "salasanan kysyminen ei onnistu eräajossa\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Syötä salasana: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5029,21 +5034,21 @@ msgstr ""
 "\n"
 "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Toista salasana: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5058,166 +5063,166 @@ msgstr ""
 "käytät erittäin suurta kuvaa, myös avaimesta tulee erittäin suuri!\n"
 "Kuvan koon ollessa suunnilleen 240x288, on koko sopiva käyttöön.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Syötä JPEG-tiedostonimi valokuvatunnisteelle: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" ei ole JPEG-tiedosto\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Onko tämä oikein (k/E/l)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "valokuvatunnistetta ei voi näyttää!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "Avain on uusittu"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "Avain on murrettu"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "Avain ei ole enää käytössä"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "Käyttäjätunnus ei ole enää käytössä"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "mitätöinnin syy: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "mitätöintikommentti: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMlLoO"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Luottamusarvoa ei ole asetettu seuraavalle:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Tämä avain todennäköisesti kuuluu haltijalle\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = En tiedä\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = EN luota\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Luotan ehdottomasti\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = takaisin päävalikkoon\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " o = ohita tämä avain\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " l = lopeta\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Valintasi? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Haluatko varmasti luottaa tähän avaimeen ehdottomasti? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Varmennepolku ehdottomasti luotettuun julkiseen avaimeen:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
 "haltijalleen.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
 "haltijalleen.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Tämä avain todennäköisesti kuuluu haltijalle\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Tämä on oma avain\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5229,114 +5234,114 @@ msgstr ""
 "kysymykseen kyllä\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROITUS: Käytettyyn avaimeen ei luoteta!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "VAROITUS: tämä avain saattaa olla mitätöity (mitätöintiavainta ei "
 "saatavilla)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROITUS: Tämän avaimen haltija on mitätöinyt avaimen!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Tämä voi merkitä sitä, että allekirjoitus on väärennös.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROITUS: Haltija on mitätöinyt tämän aliavaimen!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Huom: Tämä avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Huom: Tämä avain on vanhentunut!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "VAROITUS: Tätä avainta ei ole varmennettu luotettavalla allekirjoituksella!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
 "haltijalleen.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROITUS: Tähän avaimeen EI luoteta!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Allekirjoitus on luultavasti VÄÄRENNÖS.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROITUS: Tätä avainta ei ole varmennettu tarpeeksi luotettavalla \n"
 "allekirjoituksella!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ei ole varmaa, että allekirjoitus kuuluu haltijalle.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ohitettu: julkinen avain on jo olemassa\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Et määritellyt käyttäjätunnusta. (voit käyttää valitsinta \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5344,169 +5349,169 @@ msgstr ""
 "\n"
 "Syötä käyttäjätunnus.  Lopeta tyhjällä rivillä: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Käyttäjätunnusta ei löydy.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ohitettu: julkinen avain on jo asetettu oletusvastaanottajaksi\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "Julkinen avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "ohitettu: julkinen avain on jo asetettu\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "ei kelvollisia vastaanottajia\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "dataa ei ole tallennettu, käytä valitsinta \"--output\" tallentaaksesi\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Erillinen allekirjoitus.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Anna datatiedoston nimi: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "luetaan vakiosyötettä ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "ei allekirjoitettua dataa\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "nimetön vastaanottaja; yritän käyttää salaista avainta %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, nimetön vastaanottaja olet sinä.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vanhaa DEK-koodaus ei tueta\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "salausalgoritmi %d%s on tuntematon tai poistettu käytöstä\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "HUOM: salausalgoritmia %d ei löydy valinnoista\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet epäonnistui: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Mitätöinnin tekee:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Tämä on arkaluonteinen mitätöintiavain)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-koodattu tuloste määritetty.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet epäonnistui: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salaista avainta \"%s\" ei löydy: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "HUOM: Tätä avainta ei ole suojattu!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5526,120 +5531,120 @@ msgstr ""
 "tulostusjärjestelmä saattaa tallentaa datan ja saattaa sen muiden "
 "saataville!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "Peru"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Todennäköisesti haluat valita %d tässä)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Syötä vapaaehtoinen kuvaus; lopeta tyhjään riviin:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Mitätöinnin syy: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Kelpaako tämä? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Salasana ei kelpaa; yritä uudestaan"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VAROITUS: Havaittiin heikko avain -  vaihda salasanaa uudestaan.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "luodaan paheksuttava 16-bittinen tarkistussumma salaisen avaimen suojaksi\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "luotu avain on heikko - yritän uudestaan\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "heikon avaimen luomista symmetriselle salaimelle ei voitu välttää; \n"
 "yritettiin %d kertaa!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROITUS: allekirjoitustiiviste ei täsmää viestin kanssa\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "VAROITUS: allekirjoitusaliavaimella %08lX on epäkelpo ristiinvarmennus\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5647,7 +5652,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5655,57 +5660,36 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "HUOM: allekirjoitusavain %08lX vanheni %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "Epäkelpo allekirjoitus avaimelta %08lX oletettavasti johtuen tuntemattomasta "
 "\"critical bit\":istä\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "avain %08lX: ei vastaavaa aliavainta aliavaimen mitätöintipaketille\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "avain %08lX: ei aliavainta aliavaimen liitosallekirjoitukselle\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"notaatiodataa ei voi laittaa v3-allekirjoituksiin (PGP 2.x -tyyliset)\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"notaatiodataa ei voi laittaa v3-avainallekirjoituksiin (PGP 2.x -tyyliset)\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VAROITUS: %%-laajennus ei onnistu (liian suuri).  Käytetään "
 "laajentamatonta.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"käytäntö-URL:ia ei voi laittaa v3-allekirjoituksiin (PGP 2.x -tyyliset)\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"käytäntö-URL:ia ei voi laittaa v3-avainallekirjoituksiin (PGP 2.x -"
-"tyyliset)\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5713,7 +5697,7 @@ msgstr ""
 "VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
 "Käytetään laajentamatonta.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5722,77 +5706,77 @@ msgstr ""
 "VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
 "Käytetään laajentamatonta.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "voit tehdä erillisiä allekirjoituksia PGP 2.x -muodon avaimilla \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "allekirjoitetaan:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x -muodon avaimilla voi allekirjoittaa tekstimuotoon \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "käytetään %s-salausta\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "avainta ei ole merkitty turvattomaksi - sitä ei voida käyttää jäljitellyn\n"
 "satunnaislukugeneraattorin kanssa!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ohitetaan \"%s\": kopio\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ohitetaan \"%s\": %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "ohitetaan \"%s\": tämä on PGP:n luoma ElGamal-avain, jolla ei voi "
 "allekirjoittaa turvallisesti!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5801,348 +5785,348 @@ msgstr ""
 "# Luettelo annettuista luottamusarvoista, luotu %s\n"
 "# (Käytä \"gpg --import-ownertrust\" palauttaaksesi ne)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "rivi on liian pitkä\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "tuo luottamusasteet"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "virhe etsittäessä luottamustietuetta: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "lukuvirhe: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synkronointi epäonnistui: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek epäonnistui: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: kirjoittaminen epäonnistuin (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "trustdb-tapahtuma on liian suuri\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: hakemistoa ei ole olemassa!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versiotietueen luonti epäonnistui: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: luotu trustdb ei kelpaa\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb luotu\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "HUOM: trustdb:n ei voida kirjoittaa\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb ei kelpaa\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: virhe päivitettäessä versiotietuetta: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: virhe luettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: virhe kirjoitettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek epäonnistui: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb-tiedosto\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiotietue tietuenumerolla %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: tiedostoversio %d ei kelpaa\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: tietueen nollaaminen epäonnistui: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: tietueeseen lisääminen epäonnistui: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb on turmeltunut; suorita \"gpg --fix-trustdb\"\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "yli %d merkkiä pitkiä tekstirivejä ei voi käsitellä\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "syöterivi on yli %d merkkiä pitkä\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "\"%s\" ei kelpaa pitkänä avaintunnuksena\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "avain %08lX: hyväksytty luotettuna avaimena\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "avain %08lX esiintyy trustdb:ssä useammin kuin kerran\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "avain %08lX: luotetulle avaimelle ei löydy julkista avainta - ohitetaan\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Avain on määritelty ehdottoman luotettavaksi.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "luottamustietue %lu, pyyntötyyppi %d: luku epäonnistui: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "luottamustietue %lu ei ole pyydettyä tyyppiä %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[mitätöity] "
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[vanhentunut] "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tuntematon "
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "ei koskaan"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "seuraava trustdb tarkistus %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "julkista avainta %08lX ei löydy: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "tee --check-trustdb, kiitos\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "tarkistetaan trustdb:tä\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6157,309 +6141,327 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "syöterivi %u on liian pitkä tai rivinvaihto puutuu\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "yleinen virhe"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "tuntematon pakettityyppi"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "tuntematon versio"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "tuntematon julkisen avaimen algoritmi"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "tuntematon tiivistealgoritmi"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "julkinen avain ei kelpaa"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "salainen avain ei kelpaa"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "allekirjoitus ei täsmää"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "tarkistussumma ei täsmää"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "väärä salasana"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "julkista avainta ei löydy"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "tuntematon salausalgoritmi"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "avainrenkaan avaaminen ei onnistu"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "virheellinen paketti"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "virheellinen ascii-koodaus"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "käyttäjätunnusta ei löydy"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "salaista avainta ei löydy"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "käytetty salainen avain on väärä"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "ei tuettu"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "avain ei kelpaa"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "virhe tiedostoa luettaessa"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "virhe tiedostoon kirjoitettaessa"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "tuntematon pakkausalgoritmi"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "virhe tiedostoa avattaessa"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "virhe tiedostoa luotaessa"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "väärä salasana"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "julkisen avaimen algoritmi ei ole käytössä"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "salausalgoritmi ei ole käytössä"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "tuntematon allekirjoitusluokka"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "luottamustietokantavirhe"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "MPI ei kelpaa"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "resurssiraja"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "virheellinen avainrengas"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "virheellinen varmenne"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "väärin muotoiltu käyttäjätunnus"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "virhe tiedostoa suljettaessa"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "virhe nimettäessä tiedostoa uudelleen"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "virhe tiedostoa poistettaessa"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "odottamatonta dataa"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "aikaleima ei täsmää"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "käyttökelvoton julkisen avaimen algoritmi"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "tiedosto on olemassa"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "heikko avain"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "virheellinen argumentti"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "URI ei kelpaa"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "URI-muotoa ei tueta"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "verkkovirhe"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "salaamaton"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "ei käsitelty"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "julkista avainta ei voi käyttää"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "salaista avainta ei voi käyttää"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "avainpalvelinvirhe"
 
-#: util/errors.c:109
+#: util/errors.c:107
 #, fuzzy
 msgid "canceled"
 msgstr "Peru"
 
-#: util/errors.c:110
+#: util/errors.c:108
 #, fuzzy
 msgid "no card"
 msgstr "salaamaton"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "ei allekirjoitettua dataa\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "...tämä on ohjelmistovika (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "olet löytänyt ohjelmistovian ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "kyllä|kylla|joo"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "kK"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "ei"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "eE"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "lopeta|sulje"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "lLsS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "VAROITUS: käytetään suojaamatonta muistia!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "lisätietoja osoitteesta http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "toiminto on mahdollinen vain, jos suojattu muisti alustetaan\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "notaatiodataa ei voi laittaa v3-allekirjoituksiin (PGP 2.x -tyyliset)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "notaatiodataa ei voi laittaa v3-avainallekirjoituksiin (PGP 2.x -"
+#~ "tyyliset)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "käytäntö-URL:ia ei voi laittaa v3-allekirjoituksiin (PGP 2.x -tyyliset)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "käytäntö-URL:ia ei voi laittaa v3-avainallekirjoituksiin (PGP 2.x -"
+#~ "tyyliset)\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n"
 
diff --git a/po/fr.po b/po/fr.po
index 93ea8967b..048082a35 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -19,93 +19,93 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "impossible de g�n�rer un nombre premier avec pbits=%u qbits=%u\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "impossible de g�n�rer un nombre premier avec moins de %d bits\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "aucun module de r�cup�ration d'entropie n'a �t� trouv�.\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "impossible de verrouiller `%s'\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n'est pas un fichier r�gulier - ignor�\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "note: le fichier `random_seed' est vide\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "AVERTISSEMENT: la taille du fichier `random_seed' est invalide.\n"
 "Celui-ci ne sera pas utilis�.\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossible de lire `%s': %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "note: le fichier `random_seed' n'a pas �t� mis � jour\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossible d'�crire `%s': %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossible de fermer `%s': %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENTION: utilisation d'un g�n�rateur de nombres al�atoires peu s�r !!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -119,7 +119,7 @@ msgstr ""
 "N'UTILISEZ PAS LES DONN�ES G�N�R�ES PAR CE PROGRAMME !!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -129,7 +129,7 @@ msgstr ""
 "faire autre chose pour ne pas vous ennuyer, car cela donnera une\n"
 "meilleure qualit� � l'entropie.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -140,64 +140,64 @@ msgstr ""
 "Il n'y a pas assez d'octets al�atoires disponibles. Faites autre chose\n"
 "pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "impossible de stocker la date de cr�ation: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "la lecture de la cl� publique a �chou�: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr "la r�ponse ne contient pas les donn�es de cl� publique\n"
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr "la r�ponse ne contient pas le modulo RSA\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la r�ponse ne contient pas l'exposant public RSA\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "l'appel du PIN a retourn� une erreur: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 "Le code PIN pour CHV%d est trop court ; la longueur minimale\n"
 "est %d\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la v�rification CHV%d a �chou�: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr "l'acc�s aux commandes d'administration n'est pas configur�\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr "erreur pendant la r�cup�ration de l'�tat CHV de la carte\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr "la carte est irr�m�diablement bloqu�e !\n"
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -207,352 +207,357 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr "|A|code PIN d'administration"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nouveau code PIN d'administration"
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr "|N|Nouveau code PIN"
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 msgid "error reading application data\n"
 msgstr "erreur pendant la lecture de donn�es d'application\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 msgid "error reading fingerprint DO\n"
 msgstr "erreur pendant la lecture de l'empreinte DO\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 msgid "key already exists\n"
 msgstr "la cl� existe d�j�\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr "la cl� existante sera remplac�e\n"
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 msgid "generating new key\n"
 msgstr "g�n�rer une nouvelle cl�\n"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr "l'horodatage de cr�ation est manquant\n"
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "le module RSA est manquant ou bien sa taille n'est pas %d bits\n"
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "l'exposant public RSA est manquant ou trop �lev� (plus de %d bits)\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 "le nombre premier RSA %s est manquant ou bien sa taille n'est pas\n"
 "%d bits\n"
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr "attendez que la cl� se g�n�re...\n"
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 msgid "generating key failed\n"
 msgstr "la g�n�ration de la cl� a �chou�\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "la g�n�ration de cl� a �t� effectu�e (%d secondes)\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structure de carte OpenPGP invalide (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures cr��es jusqu'ici: %lu\n"
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "la v�rification du code PIN d'administration est actuellement interdite\n"
 "au travers de cette commande\n"
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "armure: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "en-t�te d'armure invalide: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "en-t�te d'armure: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "en-t�te de signature claire invalide\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "en-t�te d'armure: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "signatures en texte clair imbriqu�es\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 msgid "unexpected armor: "
 msgstr "armure inattendue: "
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "ligne �chapp�e par `-' invalide: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caract�re %02X invalide en radix64 ignor�\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "fin de fichier pr�matur�e (pas de CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "fin de fichier pr�matur�e (dans le CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "CRC d�form�\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Erreur de CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 msgid "premature eof (in trailer)\n"
 msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de remorque\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armure invalide: ligne plus longue que %d caract�res\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caract�re cit�-imprimable (quoted-printable) dans l'armure provenant\n"
 "certainement d'un agent de transfert de messages bogu�\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la carte OpenPGP n'est pas disponible: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "carte OpenPGP n� %s d�tect�e\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr "[non positionn�]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "female"
 msgstr "f�minin"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "unspecified"
 msgstr "non sp�cifi�"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "not forced"
 msgstr "non forc�"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr "forc�"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Erreur: Seul l'ASCII standard est permis pour l'instant.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Erreur: Le caract�re � < � ne peut pas �tre utilis�.\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Erreur: Les espaces doubles ne sont pas permis.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr "Nom du d�teneur de la carte: "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr "Pr�nom du d�teneur de la carte: "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Erreur: Nom combin� trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 msgid "URL to retrieve public key: "
 msgstr "URL pour r�cup�rer la cl� publique: %s"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Erreur: URL trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr "Donn�es d'identification (nom du compte): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 "Erreur: Donn�es d'indentification trop longues (la limite est\n"
 "%d caract�res).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr "Donn�es DO priv�es: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Erreur: DO priv� trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 msgid "Language preferences: "
 msgstr "Pr�f�rences de langue: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 msgid "Error: invalid length of preference string.\n"
 msgstr "Erreur: longueur invalide de la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Erreur: caract�res invalide dans la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sexe ((M)asculin, (F)�minin ou espace): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 msgid "Error: invalid response.\n"
 msgstr "Erreur: r�ponse invalide.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 msgid "CA fingerprint: "
 msgstr "empreinte de l'autorit� de certification: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Erreur: empreinte mal format�e.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "l'op�ration sur la cl� n'est pas possible: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 msgid "not an OpenPGP card"
 msgstr "ce n'est pas une carte OpenPGP"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr "Remplacer la cl� existante ? (o/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Faire une sauvegarde hors carte de la cl� de chiffrement ? (O/n) "
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr "Remplacer les cl�s existantes ? (o/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -563,140 +568,140 @@ msgstr ""
 "   PIN = `%s'     PIN admin = `%s'\n"
 "Vous devriez les changer avec la commande --change-pin\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 msgid "Please select the type of key to generate:\n"
 msgstr "S�lectionnez le type de cl� � g�n�rer:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cl� de signature\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cl� de chiffrement\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cl� d'authentification\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 msgid "Please select where to store the key:\n"
 msgstr "S�lectionnez l'endroit o� stocker la cl�:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 msgid "unknown key protection algorithm\n"
 msgstr "algorithme de protection de cl� inconnu\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 msgid "secret parts of key are not available\n"
 msgstr "Les parties secr�tes de la cl� ne sont pas disponibles.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 msgid "secret key already stored on a card\n"
 msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "show admin commands"
 msgstr "indiquer les commandes d'administration"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "afficher cette aide"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "list all available data"
 msgstr "lister toutes les donn�es disponibles"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr "changer le nom du propri�taire de la carte"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr "changer l'URL pour r�cup�rer la cl�"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr "aller chercher la cl� sp�cifi�e dans l'URL de la carte"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change the login name"
 msgstr "changer le nom d'identification"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "change the language preferences"
 msgstr "changer les pr�f�rences de langue"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr "changer le sexe du propri�taire de la carte"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "change a CA fingerprint"
 msgstr "changer l'empreinte d'une autorit� de certification"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr ""
 "inverser le param�tre obligeant � rentrer le code PIN pour les\n"
 "signatures"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 msgid "generate new keys"
 msgstr "g�n�rer de nouvelles cl�s"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr "menu pour changer ou d�verrouiller le PIN"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr "v�rifier le code PIN et lister toutes les donn�es"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 msgid "Admin-only command\n"
 msgstr "La commande n'est utilisable qu'en mode administration\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 msgid "Admin commands are allowed\n"
 msgstr "Les commandes d'administration sont permises\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "la cl� secr�te n'est pas disponible"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Ins�rez la carte et tapez entr�e ou entrez 'c' pour annuler: "
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -706,134 +711,134 @@ msgstr ""
 "s�rie:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Tapez entr�e quand vous �tes pr�t ou entrez 'c' pour annuler: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr "Entrez le nouveau code PIN admin: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr "Entrez le nouveau code PIN: "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr "Entrez le code PIN admin: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr "Entrez le code PIN: "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 msgid "Repeat this PIN: "
 msgstr "R�p�tez ce code PIN: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 msgid "PIN not correctly repeated; try again"
 msgstr "le code PIN n'a pas �t� correctement r�p�t� ; recommencez"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cl� � %s � introuvable: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� : %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(� moins de sp�cifier la cl� par son empreinte)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "impossible de faire cela en mode automatique sans � --yes �\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Enlever cette cl� du porte-cl�s ? (o/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "C'est une cl� secr�te ! - faut-il vraiment l'effacer ? (o/N) "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "les informations de confiance au propri�taires ont �t� effac�es\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utiliser l'option �--delete-secret-keys� pour l'effacer d'abord.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "il n'est pas possible d'utiliser un paquet ESK sym�trique en mode S2K\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "utilisation de l'algorithme de chiffrement %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' d�j� compress�\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "le chiffrement RSA ne se fait qu'avec des cl�s de moins de 2048 bits\n"
 "en mode --pgp2\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "impossible d'utiliser le chiffre IDEA pour toutes les cl�s vers\n"
 "lesquelles vous chiffrez.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -841,7 +846,7 @@ msgstr ""
 "AVERTISSEMENT: forcer le chiffrement sym�trique %s (%d) entre\n"
 "en d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -850,176 +855,176 @@ msgstr ""
 "AVERTISSEMENT: forcer l'algorithme de compression %s (%d) entre\n"
 "en d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forcer le chiffrement sym�trique %s (%d) entre en d�saccord\n"
 "avec les pr�ferences du destinataire\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s chiffr� pour: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "donn�es chiffr�es avec %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffr� avec l'algorithme inconnu %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENTION: Le message a �t� chiffr� avec une cl� faible pendant le\n"
 "chiffrement sym�trique.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "probl�me de gestion des paquets chiffr�s\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "aucun programme d'ex�cution distante n'est support�\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "les appels aux programmes externes sont d�sactiv�s car les permissions\n"
 "du fichier d'options sont trop peu s�res\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "cette plateforme a besoin de fichiers temporaires pour appeler des\n"
 "programmes externes\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "impossible d'ex�cuter le programme `%s': %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "impossible d'ex�cuter l'int�rpr�teur de commandes `%s': %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "erreur syst�me pendant l'appel du programme externe: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "sortie non naturelle du programme externe\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "impossible d'ex�cuter le programme externe\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "impossible de lire la r�ponse du programme externe: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible d'enlever le fichier temporaire\n"
 "(%s) `%s': %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible d'effacer le r�pertoire temporaire `%s':\n"
 "%s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "La signature sera marqu�e comme non-r�vocable.\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "aucune cl� de r�vocation trouv�e pour � %s �\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "r�voquer la cl� ou les sous-cl�s s�lectionn�es"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "nettoyer les parties inutilisables de la cl�"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 msgid "exporting secret keys not allowed\n"
 msgstr "il est interdit d'exporter les cl� secr�tes\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "cl� %s: non prot�g�e - ignor�e\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cl� %s: cl� de style PGP 2.x - ignor�e\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "AVERTISSEMENT: la cl� secr�te %s n'a pas de somme de contr�le SK\n"
 "simple\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1027,127 +1032,127 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "list and check key signatures"
 msgstr "lister et v�rifier les signatures des cl�s"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "enlever les cl�s du porte-cl�s secret"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "mettre � jour les cl�s depuis un serveur"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr "afficher l'�tat de la carte"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr "changer les donn�es d'une carte"
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr "changer le code PIN d'une carte"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1157,51 +1162,51 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "demander avant d'�craser un fichier"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr "utiliser strictement le comportement OpenPGP"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr "g�n�rer des messages compatibles avec PGP 2.x"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1209,7 +1214,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1229,17 +1234,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1249,7 +1254,7 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1257,85 +1262,85 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "aucun signe = trouv� dans la d�finition du groupe `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire personnel `%s' est\n"
 "peu s�r\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du fichier de configuration `%s'\n"
 "est peu s�r\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
 "s�r\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire personnel `%s'\n"
 "sont peu s�res\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du fichier de configuration\n"
 "`%s' sont peu s�res\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions de l'extension `%s' sont\n"
 "peu s�res\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le r�pertoire personnel `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1343,21 +1348,21 @@ msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le fichier de configuration `%s'\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour l'extension `%s'\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "r�pertoire personnel `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1365,572 +1370,572 @@ msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "fichier de configuration `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant\n"
 "l'extension `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr ""
 "passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
 "et inversement"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: l'ancien fichier d'options par d�faut `%s' a �t� ignor�\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "l'extension de chiffrement `%s' n'a pas �t� charg�e car ses\n"
 "permissions sont peu s�res\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' n'est pas un jeu de caract�res valide\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "NOTE: %s n'est pas disponible dans cette version\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "pas d'ex�cution ave une m�moire non s�curis�e � cause de %s\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature d�tach�e ou en texte clair\n"
 "qu'en mode --pgp2\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "vous ne pouvez pas signer et chiffrer en m�me temps en mode --pgp2\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n"
 "est activ�.\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "chiffrer un message en mode --pgp2 n�cessite l'algorithme de chiffrage IDEA\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth doit �tre compris entre 1 et 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de chiffrement `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de hachage `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de compression `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISSEMENT: des destinataires (-r) ont �t� donn�s alors que le\n"
 "chiffrement ne se fait pas par cl� publique\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt avec --s2k-mode 0\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt en mode %s.\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "Vous ne pouvez pas utiliser --symmetric --sign --encrypt avec\n"
 "--s2k-mode 0\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser --symmetric --sign --encrypt\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 msgid "[User ID not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La cl� invalide %s a �t� rendue valide par\n"
 "--allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "pas de sous-cl� secr�te pour la cl� publique %s - ignor�e\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "utilisation de la sous-cl� %s � la place de la cl�\n"
 "principale %s\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cl� %s: cl� secr�te sans cl� publique - non prise en compte\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "enlever les cl�s de ce porte-cl�s"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 "faire en sorte que les conflits d'horodatage ne soient qu'un\n"
 "avertissement non fatal"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Utilisation: gpgv [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1938,7 +1943,7 @@ msgstr ""
 "Syntaxe: gpg [options] [fichiers]\n"
 "Verifier des signatures avec des cl�s de confiance connues\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1949,7 +1954,7 @@ msgstr ""
 "de confiance (web-of-trust); cela n'a rien � voir avec le r�seau des\n"
 "certificats (cr�� implicitement)"
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1961,18 +1966,18 @@ msgstr ""
 "en g�n�ral les cl�s dont vous avez acc�s � la cl� secr�te. R�pondez\n"
 "\"oui\" pour indiquer que votre confiance en cette cl� est ultime\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Si vous voulez utiliser cette cl� peu s�re quand-m�me, r�pondez �oui�."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Entrez le nom d'utilisateur de la personne � qui vous voulez envoyer\n"
 "le message."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1997,7 +2002,7 @@ msgstr ""
 "La premi�re cl� (cl� principale) doit toujours �tre une cl� capable\n"
 "de signer."
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2008,16 +2013,16 @@ msgstr ""
 "pour certains domaines.\n"
 "Consultez votre expert en s�curit� d'abord."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Entrez la taille de la cl�"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "R�pondez �oui� ou �non�"
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2029,19 +2034,19 @@ msgstr ""
 "mauvais - le syst�me essaierait d'interpr�ter la valeur donn�e comme un\n"
 "intervalle."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Entrez le nom du propri�taire de la cl�"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "entrez une adresse e-mail optionnelle mais hautement recommand�e"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Entrez un commentaire optionnel"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2055,11 +2060,11 @@ msgstr ""
 "O pour continuer � g�n�rer la cl�.\n"
 "Q pour arr�ter de g�n�rer de cl�."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "R�pondez �oui� (ou simplement �o�) pour g�n�rer la sous-cl�"
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2126,11 +2131,11 @@ msgstr ""
 "\n"
 "Si vous ne savez pas quelle r�ponse est la bonne, r�pondez \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "R�pondez �oui� si vous voulez signer TOUS les noms d'utilisateurs"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2138,11 +2143,11 @@ msgstr ""
 "R�pondez �oui� si vous voulez vraiment supprimer ce nom\n"
 "d'utilisateur. Tous les certificats seront alors perdus en m�me temps !"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "R�pondez �oui� s'il faut vraiment supprimer la sous-cl�"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2153,7 +2158,7 @@ msgstr ""
 "�tablir une connection de confiance vers la cl� ou une autre cl� certifi�e\n"
 "par celle-l�."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2165,7 +2170,7 @@ msgstr ""
 "vous soyez s�r de quelle cl� a �t� utilis�e car cette cl� de signature\n"
 "peut �tablir une connection de confiance vers une autre cl� d�j� certifi�e."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2173,7 +2178,7 @@ msgstr ""
 "Cette signature n'est pas valide. Vous devriez la supprimer de votre\n"
 "porte-cl�s."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2187,7 +2192,7 @@ msgstr ""
 "cette auto-signature est invalide pour une certaine raison et si une autre\n"
 "est disponible."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2197,25 +2202,25 @@ msgstr ""
 "ceux qui sont s�lectionn�s) vers la liste actuelle. La date de toutes\n"
 "les auto-signatures affect�es seront avanc�es d'une seconde.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "R�p�tez la derni�re phrase de passe pour �tre s�r de ce que vous\n"
 "avez tap�."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Donnez le nom du fichier auquel la signature se rapporte"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "R�pondez �oui� s'il faut vraiment r��crire le fichier"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2223,7 +2228,7 @@ msgstr ""
 "Entrez le nouveau nom de fichier. Si vous tapez simplement ENTR�E le\n"
 "fichier par d�faut (indiqu� entre crochets) sera utilis�."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2252,7 +2257,7 @@ msgstr ""
 "      utilis�. Cela sert g�n�ralement � indiquer qu'une adresse e-mail\n"
 "      est invalide.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2262,541 +2267,541 @@ msgstr ""
 "avez �mis ce certificat de r�vocation. Essayez de garder ce texte concis.\n"
 "Une ligne vide d�limite la fin du texte.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Pas d'aide disponible"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "la cl� publique ne correspond pas � la cl� secr�te !\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "nettoyer les parties inutilisables de la cl�"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a �t� ignor�\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu cl�s trait�es jusqu'ici\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Quantit� totale trait�e: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nouvelles cl�s ignor�es: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      import�e: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchang�e: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-cl�s: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles r�vocations de cl�s: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            cl�s secr�tes lues: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       cl�s secr�tes import�es: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  non import�e: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "          signatures nettoy�es: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   noms d'utilisateur nettoy�s: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, fuzzy, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "AVERTISSEMENT: la cl� %s contient des pr�ferences pour des\n"
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "algorithmes indisponibles sur ces noms d'utilisateurs:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de chiffrement %s\n"
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de hachage %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de compression %s\n"
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "il est fortement sugg�r� de mettre � jour vos pr�f�rences et\n"
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "redistribuer cette cl� pour �viter les probl�mes potentiels qui seraient\n"
 "caus�s par des algorithmes non appropri�s\n"
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "vous pouvez mettre � jour vos pr�f�rences avec: \n"
 "gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cl� %s: corruption de sous-cl� PKS r�par�e\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur non auto-sign� accept� � %s �\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cl� %s: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cl� %s: cl� publique non trouv�e: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cl� %s: nouvelle cl� - ignor�e\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 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:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cl� %s: cl� publique � %s � import�e\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cl� %s: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cl� %s: impossible de trouver le bloc de cl�s original: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cl� %s: impossible de lire le bloc de cl�s original: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cl� %s: � %s � un nouvel utilisateur\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cl� %s: � %s � %d nouveaux utilisateurs\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cl� %s: � %s � une nouvelle signature\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cl� %s: � %s � %d nouvelles signatures\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cl� %s: � %s � une nouvelle sous-cl�\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cl� %s: � %s � %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "cl� %s: � %s � %d signature nettoy�e\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "cl� %s: � %s � %d signatures nettoy�es\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "cl� %s: � %s � %d nom d'utilisateur nettoy�\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "cl� %s: � %s � %d noms d'utilisateur nettoy�s\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cl� %s: � %s � n'a pas chang�\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "cl� %s: cl� secr�te avec le chiffrement invalide %d - non prise\n"
 "en compte\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "il est interdit d'importer les cl� secr�tes\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-cl�s par d�faut: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cl� %s: cl� secr�te import�e\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cl� %s: d�j� dans le porte-cl�s secret\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cl� %s: cl� secr�te non trouv�e: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cl� %s: pas de cl� publique - le certificat de r�vocation ne peut\n"
 "�tre appliqu�\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - rejet�\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cl� %s: � %s � certificat de r�vocation import�\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cl� %s: pas de nom d'utilisateur pour la signature\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cl� %s: algorithme de cl� publique non support� avec le nom\n"
 "d'utilisateur � %s �\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cl� %s: auto-signature du nom d'utilisateur � %s � invalide\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cl� %s: pas de sous-cl� pour relier la cl�\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cl� %s: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cl� %s: liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cl� %s: supression de liaisons multiples avec des sous-cl�s\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cl� %s: pas de sous-cl� pour r�voquer la cl�\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cl� %s: r�vocation de sous-cl� invalide\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cl� %s: suppression de la r�vocation de sous-cl�s multiples\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur � %s � non pris en compte\n"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cl� %s: sous-cl� non prise en compte\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cl� %s: signature non exportable (classe 0x%02X) - ignor�e\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cl� %s: certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - ignor�e\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cl� %s: classe de signature non attendue (0x%02X) - ignor�e\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cl� %s: nom d'utilisateur en double d�tect� - fusion accomplie\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: recherche de\n"
 "la cl� de r�vocation %s\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: la cl� de\n"
 "r�vocation %s est absente.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cl� %s: certificat de r�vocation � %s � ajout�\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cl� %s: ajout de la signature de cl� directe\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOTE: le num�ro de s�rie d'une cl� n'est pas celui de la carte\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOTE: la cl� primaire est en ligne et stock�e sur la carte\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOTE: la cl� secondaire est en ligne et stock�e sur la carte\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "le porte-cl�s `%s` a �t� cr��\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "ressource bloc de cl�s `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "la reconstruction du cache de porte-cl�s a �chou� : %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[r�vocation]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "une signature non v�rifi�e � cause d'une cl� manquante\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures non v�rifi�es � cause de cl�s manquantes\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "une signature non v�rifi�e � cause d'une erreur\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures non v�rifi�es � cause d'erreurs\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "un nom d'utilisateur sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2808,17 +2813,17 @@ msgstr ""
 "v�rifier son passeport, v�rifier les empreintes de plusieurs sources\n"
 "diff�rentes, etc.)\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = je crois marginalement\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = je fais enti�rement confiance\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2828,47 +2833,47 @@ msgstr ""
 "Une profondeur sup�rieure � 1 permet � la cl� que vous signez de faire\n"
 "des signatures de confiance de votre part.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Entrez un domaine pour restreindre cette signature, ou bien appuyez\n"
 "sur la touche entr�e pour aucun domaine.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Etes-vous s�r de toujours vouloir le signer ? (o/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  Impossible de signer.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Le nom d'utilisateur \"%s\" est expir�."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Le nom d'utilisateur \"%s\" ne comporte pas d'auto-signature."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Le nom d'utilisateur \"%s\" est susceptible d'�tre sign�.  "
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2877,11 +2882,11 @@ msgstr ""
 "L'auto-signature de \"%s\"\n"
 "est de style PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voulez vous la changer en une auto-signature OpenPGP ? (o/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2890,13 +2895,13 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "a expir�.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Voulez-vous cr�er une nouvelle signature pour remplacer celle qui a\n"
 "expir� ? (o/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2905,43 +2910,43 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "est locale.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voulez vous la rendre compl�tement exportable ? (o/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "� %s � a d�j� �t� sign� localement par la cl� %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "� %s � a d�j� �t� sign� par la cl� %s\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voulez-vous vraiment le signer encore une fois ? (o/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Rien � signer avec la cl� %s\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Cette cl� a expir� !"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Cette cl� va expirer le %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voulez-vous que votre signature expire en m�me temps ? (O/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2949,11 +2954,11 @@ msgstr ""
 "il n'est pas possible de g�n�rer une signature OpenPGP d'une cl� de style\n"
 "PGP 2.x en mode --pgp2.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Cela rendra la cl� inutilisable par PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2963,31 +2968,31 @@ msgstr ""
 "appartient r�ellement � la personne sus-nomm�e ? Si vous ne savez\n"
 "quoi r�pondre, entrez \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Je ne r�pondrai pas.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Je n'ai pas v�rifi� du tout.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) J'ai un peu v�rifi�.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) J'ai v�rifi� tr�s soigneusement.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Votre s�lection ? (entrer '?' pour plus d'informations): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2996,92 +3001,92 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec votre cl� � %s � (%s)\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 msgid "This will be a self-signature.\n"
 msgstr "Ceci sera une auto-signature.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "AVERTISSEMENT: la signature ne sera pas marqu�e comme\n"
 "non-exportable.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "AVERTISSEMENT: La signature ne sera pas marqu�e comme\n"
 "non-r�vocable.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La signature sera marqu�e comme non-exportable.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La signature sera marqu�e comme non-r�vocable.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "I have not checked this key at all.\n"
 msgstr "Je n'ai pas du tout v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 msgid "I have checked this key casually.\n"
 msgstr "J'ai un peu v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 msgid "I have checked this key very carefully.\n"
 msgstr "J'ai v�rifi� cette cl� avec grand soin.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 msgid "Really sign? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "La cl� poss�de seulement des items partiels ou stock�s sur carte -\n"
 "pas de phrase de passe � changer.\n"
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr ""
 "Les parties secr�tes de la cl� principale sont stock�es sur la\n"
 "carte.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'�diter cette cl�: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Entrez la nouvelle phrase de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "la phrase de passe n'a pas �t� correctement r�p�t�e ; recommencez."
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3090,198 +3095,198 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voulez-vous vraiment faire cela ? (o/N) "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "afficher l'empreinte de la cl�"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "s�lectionner la sous-cl� N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "v�rifier les signatures"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "signer les noms d'utilisateurs s�lectionn�s [* voir ci-dessous pour\n"
 "les commandes similaires]"
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs locally"
 msgstr "signer le nom d'utilisateur s�lectionn� localement"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a trust signature"
 msgstr "signer les noms d'utilisateurs s�lectionn�s localement"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "signer les noms d'utilisateurs s�lectionn�s avec une signature\n"
 "non-r�vocable"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identit�"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 msgid "delete selected user IDs"
 msgstr "enlever les noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "add a subkey"
 msgstr "ajouter une sous-cl�"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr "d�placer une cl� vers une carte � puce"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr "d�placer une cl� de sauvegarde vers une carte � puce"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 msgid "delete selected subkeys"
 msgstr "enlever les sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "ajouter une cl� de r�vocation"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 msgid "delete signatures from the selected user IDs"
 msgstr "enlever les signatures des noms d'utilisateur s�lectionn�s "
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "changer la date d'expiration de la cl� ou des sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 msgid "flag the selected user ID as primary"
 msgstr "marquer le nom d'utilisateur s�lectionn� comme principal"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 msgid "toggle between the secret and public key listings"
 msgstr ""
 "passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
 "et inversement"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "lister les pr�f�rences (expert)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "lister les pr�f�rences (bavard)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "indiquer l'URL du serveur de cl�s pr�f�r� pour les noms d'utilisateur\n"
 "s�lectionn�s"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "changer la phrase de passe"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 msgid "revoke signatures on the selected user IDs"
 msgstr "r�voquer les signatures des noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 msgid "revoke selected user IDs"
 msgstr "r�voquer les noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "revoke key or selected subkeys"
 msgstr "r�voquer la cl� ou les sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 msgid "enable key"
 msgstr "activer la cl�"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 msgid "disable key"
 msgstr "d�sactiver la cl�"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 msgid "show selected photo IDs"
 msgstr "montrer les photos d'identit� s�lectionn�es"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� secr�te � %s �: %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3293,158 +3298,158 @@ msgstr ""
 "(tsign), par `nr' pour les signatures non-r�vocables (nrsign), ou\n"
 "bien toute combinaison possible (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "La cl� est r�voqu�e."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Signer vraiment tous les nom d'utilisateurs ? (o/N) "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Type de signature `%s' inconnu\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Cette commande n'est pas admise en mode %s.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Enlever r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 msgid "Really remove this user ID? (y/N) "
 msgstr "Enlever r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 msgid "Really move the primary key? (y/N) "
 msgstr "Enlever r�ellement la cl� principale ? (o/N) "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 msgid "You must select exactly one key.\n"
 msgstr "Vous devez s�lectionner exactement une cl�.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr "La commande attend un nom de fichier comme argument\n"
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Impossible d'ouvrir `%s': %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Erreur durant la lecture de la cl� de sauvegarde de `%s' : %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? (o/N) "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 msgid "Really revoke this user ID? (y/N) "
 msgstr "R�voquer r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer la cl� enti�re ? (o/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer les sous-cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer cette sous-cl� ? (o/N) "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "La confiance du propri�taire peut ne pas �tre positionn�e en utilisant\n"
 "la base de confiance d'un tiers\n"
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 msgid "Set preference list to:\n"
 msgstr "Changer la liste de pr�f�rences en :\n"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Mettre � jour r�ellement les pr�f�rences des noms d'utilisateurs\n"
 "s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 msgid "Really update the preferences? (y/N) "
 msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? (o/N) "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 msgid "Save changes? (y/N) "
 msgstr "Enregistrer les changements? (o/N) "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 msgid "Quit without saving? (y/N) "
 msgstr "Quitter sans enregistrer ? (o/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "La cl� n'a pas chang� donc la mise � jour est inutile.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Hachage: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Fonctions: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr "Serveur de cl�s: pas-de-modification"
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Serveur de cl�s pr�f�r�: "
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3452,73 +3457,73 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Il n'y a pas de pr�f�rences dans un nom d'utilisateur du style de\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Cette cl� a �t� r�voqu�e le %s par la cl� %s %s\n"
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s %s"
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, c-format
 msgid "created: %s"
 msgstr "cr��: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, c-format
 msgid "revoked: %s"
 msgstr "revoqu�: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, c-format
 msgid "expires: %s"
 msgstr "expire: %s"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation: %s"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, c-format
 msgid "trust: %s"
 msgstr " confiance: %s"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr "validit�: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr "n� de carte: "
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3526,17 +3531,17 @@ msgstr ""
 "Notez que la validit� affich�e pour la cl� n'est pas n�cessairement\n"
 "correcte tant que vous n'avez pas relanc� le programme.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "revoqu�e"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "expir�e"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3545,7 +3550,7 @@ msgstr ""
 "Cette commande risque de rendre un autre nom d'utilisateur principal\n"
 "par d�faut.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3555,75 +3560,75 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Etes-vous s�r de vouloir l'ajouter ? (y/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de photo d'identit� � une cl� du style PGP2.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "invalide"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "cl� %s: � %s � %d signature nettoy�e\n"
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "cl� %s: � %s � %d signatures nettoy�es\n"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3633,375 +3638,375 @@ msgstr ""
 "d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de r�vocateur d�sign� � une cl� de style PGP2.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossible d'utiliser une cl� de style PGP 2.x comme r�vocateur\n"
 "d�sign�.\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "vous ne pouvez pas utiliser une cl� comme son propre r�vocateur\n"
 "d�sign�\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "cette cl� � d�j� �t� d�sign�e comme un r�vocateur\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISSEMENT: l'�tablissement d'une cl� comme r�vocateur d�sign�\n"
 "est irr�versible !\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Etes-vous s�r de vouloir �tablir cette cl� comme r�vocateur\n"
 "d�sign� ? (o/N) "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 msgid "Please select at most one subkey.\n"
 msgstr "Vous devez s�lectionner au plus une sous-cl�.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changer la date d'expiration d'une sous-cl�.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl� v3\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISSEMENT: la sous-cl� de signature %s n'a pas de certificat\n"
 "crois�\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "l'auto-signature v3 du nom d'utilisateur � %s � a �t� ignor�e\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le remplacer ? (o/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le supprimer ? (o/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notation de signature: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "R��crire par-dessus ? (o/N) "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas de nom d'utilisateur avec le hachage %s\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-cl� avec l'index %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "nom d'utilisateur: � %s �\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "sign� par votre cl� %s � %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Etes-vous s�r de vouloir toujours le r�voquer ? (y/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette signature ? (o/N) "
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs sur la cl� %s:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 msgid " (non-revocable)"
 msgstr " (non-r�vocable)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "r�voqu� par votre cl� %s � %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISSEMENT: une signature de nom d'utilisateur date de %d secondes\n"
 "dans le futur\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La cl� %s est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sous-cl� %s est d�j� r�voqu�e.\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Affichage %s photo d'identit� de taille %ld pour la cl�\n"
 "0x%s (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "pr�f�rence `%s' dupliqu�e\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "trop de pr�f�rences de chiffrement\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "trop de pr�f�rences de hachage\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "trop de pr�f�rences de compression\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "�l�ment `%s' invalide dans la cha�ne de pr�f�rences\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "�criture de la signature directe\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "�criture de l'auto-signature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "�criture de la signature de liaison\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 msgid "Sign"
 msgstr "Signer"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr "Authentifier"
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr "SsCcAaQq"
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Actions possibles pour une cl� %s: "
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr "Actions actuellement permises: "
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Inverser la capacit� de signer\n"
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Inverser la capacit� de chiffrement\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Inverser la capacit� d'authentifier\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Termin�\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "S�lectionnez le type de cl� d�sir�:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA et Elgamal (par d�faut)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (chiffrement seul)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La paire de cl�s DSA fera %u bits.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "les cl�s %s peuvent faire entre %u et %u bits de longueur.\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quelle taille de cl� d�sirez-vous ? (%u) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "les tailles de cl�s %s doivent �tre dans l'intervalle %u-%u\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demand�e est %u bits\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4017,7 +4022,7 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ann�es\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4033,38 +4038,38 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ann�es\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "La signature est valide pour ? (%s) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 msgid "Key does not expire at all\n"
 msgstr "La cl� n'expire pas du tout\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 msgid "Signature does not expire at all\n"
 msgstr "La signature n'expire pas du tout\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La cl� expire le %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4072,11 +4077,11 @@ msgstr ""
 "Votre syst�me ne sait pas afficher les dates au-del� de 2038.\n"
 "Cependant la gestion des dates sera correcte jusqu'� 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 msgid "Is this correct? (y/N) "
 msgstr "Est-ce correct ? (o/N) "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4092,44 +4097,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <[email protected]> �\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "Le nom doit faire au moins 5 caract�res de long\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4140,7 +4145,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Ne mettez pas d'adresse e-mail dans le nom r�el ou dans le commentaire\n"
@@ -4156,23 +4161,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (Q)uitter ? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter ? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4181,12 +4186,12 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4200,7 +4205,7 @@ msgstr ""
 "� --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4212,52 +4217,52 @@ msgstr ""
 "pendant la g�n�ration de nombres premiers; cela donne au g�n�rateur de\n"
 "nombres al�atoires une meilleure chance d'avoir assez d'entropie.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique dans `%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�criture d'une cl� secr�te partielle dans `%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 "aucun portes-cl�s public n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "aucun portes-cl�s secret n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s public `%s': %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s secret `%s': %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "les cl�s publique et secr�te ont �t� cr��es et sign�es.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4266,13 +4271,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une sous-cl� �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La g�n�ration de cl� a �chou�: %s\n"
 
 # on s'amuse comme on peut...
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4280,7 +4285,7 @@ msgstr ""
 "la cl� a �t� cr��e %lu seconde dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4288,510 +4293,510 @@ msgstr ""
 "la cl� a �t� cr��e %lu secondes dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "NOTE: cr�er des sous-cl�s pour des cl�s v3 n'est pas conforme � OpenPGP\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 msgid "Really create? (y/N) "
 msgstr "Cr�er vraiment ? (o/N) "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "le stockage de la cl� dans la carte a �chou�: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTE: sauvegarde de la cl� de la carte dans `%s'\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "jamais    "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Politique de signature critique: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Politique de signature: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "Serveur de cl�s critique favori: "
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Notation de signature critique: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Notation de signature: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Porte-cl�s"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Empreinte de cl� principale:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "   Empreinte de la sous-cl�:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr " Empreinte de la cl� principale:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "       Empreinte de la sous-cl�:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 msgid "      Key fingerprint ="
 msgstr "    Empreinte de la cl� ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr "N� de s�rie de la carte ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "renommer `%s' en `%s' a �chou�: %s \n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 "ATTENTION: 2 fichiers avec des informations confidentielles existent.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s est le fichier original\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s est le nouveau\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "R�parez ce probl�me de s�curit� possible\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "mise en ant�m�moire du porte-cl�s `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu cl�s en ant�m�moire v�rifi�es pour l'instant (%lu signatures)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu cl�s en ant�m�moire (%lu signatures)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porte-cl�s cr��\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVERTISSEMENT: les options de serveur de cl�s `%s' ne sont pas\n"
 "utilis�es dans cette plateforme\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 msgid "disabled"
 msgstr "d�sactiv�"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > "
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocole serveur de cl�s invalide (nous %d!=gestionnaire %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cl� � %s � introuvable dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 msgid "key not found on keyserver\n"
 msgstr "cl� non trouv�e dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "requ�te de la cl� %s du serveur %s %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requ�te de la cl� %s de %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "recherche de � %s � du serveur %s %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "envoi de la cl� %s au serveur %s %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "envoi de la cl� %s � %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "recherche de � %s � du serveur %s %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 msgid "no keyserver action!\n"
 msgstr "pas d'action pour le serveur de cl�s !\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISSEMENT: le gestionnaire de serveurs de cl�s provient d'une\n"
 "version diff�rente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr "le serveurs de cl�s n'a pas envoy� son num�ro de VERSION\n"
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "pas de serveur de cl�s connu (utilisez l'option --keyserver)\n"
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "les appels externes � un serveur de cl� ne sont pas support�s dans\n"
 "cette compilation\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "pas de gestionnaire pour le type de serveurs de cl�s `%s'\n"
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "l'action `%s' n'est pas support�e avec le type de serveurs\n"
 "de cl�s `%s'\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s ne supporte pas le gestionnaire de version %d\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 msgid "keyserver timed out\n"
 msgstr "le d�lai d'attente du serveur de cl�s a expir�\n"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 msgid "keyserver internal error\n"
 msgstr "erreur interne du serveur de cl�s\n"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "erreur de communication avec le serveur de cl�s: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "� %s � n'est pas une ID de cl�: ignor�\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "rafra�chissement d'une cl� depuis %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "rafra�chissement de %d cl�s depuis %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, 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:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "cl� de session chiffr�e %s\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, 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:381
+#: g10/mainproc.c:385
 #, c-format
 msgid "public key is %s\n"
 msgstr "la cl� publique est %s\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 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:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      � %s �\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "chiffr� avec une cl� %s, ID %s\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "chiffr� avec %lu phrases de passe\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "chiffr� avec 1 phrase de passe\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "on suppose des donn�es chiffr�es avec %s\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 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:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISSEMENT: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou�: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature faite le %s\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               en utilisant la cl� %s %s\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "Cl� disponible sur: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MAUVAISE signature de � %s �"
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expir�e de � %s �"
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[incertain]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias � %s �"
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La signature a expir� le %s\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "binaire"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "modetexte"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "inconnu"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas d�tach�e\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
@@ -4799,201 +4804,201 @@ msgstr ""
 "premi�re\n"
 "sera v�rifi�e.\n"
 
-#: g10/mainproc.c:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossible d'emp�cher la g�n�ration de fichiers �core�: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat de `%s' �chou� dans %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 "AVERTISSEMENT: utilisation de l'algorithme exp�rimental � cl�\n"
 "publique %s\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 "AVERTISSEMENT: utilisation de l'algorithme exp�rimental de chiffrement\n"
 "%s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr ""
 "AVERTISSEMENT: utilisation de l'algorithme de hachage\n"
 "exp�rimental %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISSEMENT: l'algorithme de hachage %s est d�conseill�\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "le module de chiffrement IDEA n'est pas pr�sent\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: option d�conseill�e \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "utilisez \"%s%s\" � la place\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "AVERTISSEMENT: \"%s\" est une commande d�conseill�e - ne\n"
 "l'utilisez pas\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "Non-compress�"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 msgid "uncompressed|none"
 msgstr "noncompress�|non"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ce message ne sera pas utilisable par %s\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "option ambigu� `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "option `%s' inconnue\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Le fichier `%s' existe. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 msgid "Overwrite? (y/N) "
 msgstr "R��crire par-dessus ? (o/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffixe inconnu\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Entrez le nouveau nom de fichier"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "�criture vers la sortie standard\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, 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:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr " nouveau fichier de configuration `%s' cr��\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "AVERTISSEMENT: les options de `%s' ne sont pas encore actives cette fois\n"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "r�pertoire `%s' cr��\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de g�rer l'algorithme � cl� publique %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVERISSEMENT: la cl� de session chiffr�e de mani�re sym�trique est\n"
 "potentiellement non s�re\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cl� principale %s)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5005,27 +5010,27 @@ msgstr ""
 "\"%.*s\"\n"
 "cl� %u bits %s, ID %s, cr��e %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "R�p�tez la phrase de passe\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Entrez la phrase de passe\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr "impossible de demander la phrase de passe en mode automatique\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Entrez la phrase de passe: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5034,21 +5039,21 @@ msgstr ""
 "Vous avez besoin d'une phrase de passe pour d�verrouiller la\n"
 "cl� secr�te pour l'utilisateur: � %s �\n"
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cl� de %u bits %s, ID %s, cr��e le %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "        (sous-cl� de la cl� principale ID %s)"
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "R�p�tez la phrase de passe: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5063,117 +5068,117 @@ msgstr ""
 "en sera de m�me pour votre cl� !\n"
 "La meilleure taille � utiliser est 240x288.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Entrez le nom du fichier JPEG pour la photo d'identit�: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "impossible d'ouvrir le fichier JPEG `%s': %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Ce JPEG est vraiment tr�s grand (%d octets) !\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�tes-vous s�r de vouloir l'utiliser ? (o/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' n'est pas un fichier JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Cette photo est-elle correcte (o/N/q) ? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "impossible d'afficher la photo d'identit� !\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "Aucune raison sp�cifi�e"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "La cl� a �t� remplac�e"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "La cl� a �t� compromise"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "La cl� n'est plus utilis�e"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "Le nom d'utilisateur n'est plus valide"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "cause de r�vocation: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "commentaire de r�vocation: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 msgid "No trust value assigned to:\n"
 msgstr "Pas de valeur de confiance d�finie pour :\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  alias � %s �\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "Jusqu'� quel point avez-vous confiance au fait que cette cl�\n"
 "appartient r��llement � l'utilisateur nomm� ?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = ne sais pas ou ne dirai pas\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = je ne fais PAS confiance\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = je donne une confiance ultime\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 msgid "  m = back to the main menu\n"
 msgstr "  m = retour au menu principal\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  s = skip this key\n"
 msgstr "  s = sauter cette cl�\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  q = quit\n"
 msgstr "  q = quitter\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5182,41 +5187,41 @@ msgstr ""
 "Le niveau de confiance minimal pour cette cl� est: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Votre d�cision ? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Voulez-vous vraiment donner une confiance ultime � cette cl� ? (o/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificats conduisant vers une cl� � confiance ultime:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Rien ne dit que la cl� appartient vraiment � l'utilisateur\n"
 "nomm�.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Il n'est pas vraiment s�r que la cl� appartient vraiment\n"
 "� l'utilisateur nomm�.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 msgid "This key probably belongs to the named user\n"
 msgstr "Cette cl� appartient probablement � l'utilisateur nomm�\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Cette cl� nous appartient\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5227,115 +5232,115 @@ msgstr ""
 "vous pouvez r�pondre oui � la prochaine question.\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 msgid "Use this key anyway? (y/N) "
 msgstr "Utiliser cette cl� quand m�me ? (o/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENTION: Utilisation d'une cl� sans confiance !\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVERTISSEMENT: cette cl� est peut-�tre r�voqu�e (cl� de r�vocation\n"
 "absente)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVERTISSEMENT: Cette cl� � �t� r�voqu�e par son r�vocateur d�sign� !\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENTION: Cette cl� � �t� r�voqu�e par son propri�taire !\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "         This could mean that the signature is forged.\n"
 msgstr "           Cela pourrait signifier que la signature est fausse.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENTION: Cette sous-cl� � �t� r�voqu�e par son propri�taire !\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Note: cette cl� a �t� d�sactiv�e.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Note: Cette cl� a expir� !\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATTENTION: Cette cl� n'est pas certifi�e avec une signature de confiance !\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "           Rien ne dit que la signature appartient � son propri�taire.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENTION: Nous ne faisons PAS confiance � cette cl� !\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "           La signature est certainement FAUSSE.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENTION: Les signatures de cette cl� n'ont pas une confiance suffisante !\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "            Il n'est pas s�r que la signature appartient � son "
 "propri�taire.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignor�: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignor�: cl� publique d�j� pr�sente\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Vous n'avez pas sp�cifi� de nom d'utilisateur. (vous pouvez\n"
 "utiliser �-r�)\n"
 "\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr "R�cipients actuels:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5343,170 +5348,170 @@ msgstr ""
 "\n"
 "Entrez le nom d'utilisateur, en terminant par une ligne vide: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Pas d'utilisateur de ce nom.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignor�: la cl� publique est d�j� le destinataire par d�faut\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "La cl� publique est d�sactiv�e.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "ignor�: cl� publique d�j� activ�e\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinataire par d�faut � %s � inconnu\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignor�: la cl� publique est d�sactiv�e\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "les donn�es ne sont pas enregistr�es; utilisez l'option �--output� pour\n"
 "les enregistrer\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Signature d�tach�e.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Entrez le nom du fichier de donn�es: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entr�e standard...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "pas de donn�es sign�es\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinataire anonyme; essai de la cl� secr�te %s...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'accord, nous sommes le destinataire anonyme.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "l'ancien codage de la cl� de chiffrement (DEK) n'est pas support�\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algorithme de chiffrement %d%s est inconnu ou d�sactiv�\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "AVERTISSEMENT: l'algorithme de chiffrement %s n'a pas �t� trouv�\n"
 "dans les pr�f�rences du destinataire\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTE: la cl� secr�te %s a expir� le %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "NOTE: la cl� a �t� r�voqu�e"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet a �chou�: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Doit �tre r�voqu� par:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(c'est une cl� de r�vocation sensible)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation d�sign�e pour cette cl� ? (o/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "sortie avec armure ASCII forc�e.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet a �chou�: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Certificat de r�vocation cr��.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "aucune cl� de r�vocation trouv�e pour � %s �\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "la cl� secr�te � %s � n'a pas �t� trouv�e: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "pas de cl� publique correspondante: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "la cl� publique ne correspond pas � la cl� secr�te !\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette cl� ? (o/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "algorithme de protection inconnu\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTE: Cette cl� n'est pas prot�g�e !\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5526,124 +5531,124 @@ msgstr ""
 "le syst�me d'impression de votre machine pourrait stocker ces\n"
 "donn�es et les rendre accessibles � d'autres personnes !\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "choisissez la cause de la r�vocation:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "Annuler"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Vous devriez s�rement s�lectionner %d ici)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Entrez une description optionnelle ; terminez-l� par une ligne vide:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Cause de r�vocation: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(Aucune description donn�e)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 msgid "Is this okay? (y/N) "
 msgstr "Est-ce d'accord ? (o/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "les parties secr�tes ne sont pas disponibles\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "l'algorithme de protection %d%s n'est pas support�\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Phrase de passe invalide ; r�essayez"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATTENTION: Cl� faible d�tect�e - changez encore la phrase de passe.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "g�n�ration de la somme de contr�le de 16 bits (d�pr�ci�e) pour prot�ger\n"
 "la cl� secr�te\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "cl� faible g�n�r�e - nouvel essai\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "impossible d'�viter une cl� faible pour le chiffrement sym�trique:\n"
 "%d essais ont eu lieu !\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVERTISSEMENT: conflit de hachage de signature dans le message\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "AVERTISSEMENT: la sous-cl� de signature %s n'a pas de certificat\n"
 "crois�\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVERTISSEMENT: la sous-cl� de signature %s a un certificat crois�\n"
 "invalide\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la cl� publique %s est plus r�cente de %lu seconde que la signature\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la cl� publique %s est plus r�cente de %lu secondes que la signature\n"
 
 # on s'amuse comme on peut...
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5651,7 +5656,7 @@ msgstr ""
 "la cl� %s a �t� cr��e %lu seconde dans le futur (rupture\n"
 "spatio-temporelle ou probl�me d'horloge)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5659,62 +5664,38 @@ msgstr ""
 "la cl� %s a �t� cr��e %lu secondes dans le futur (rupture\n"
 "spatio-temporelle ou probl�me d'horloge)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTE: la cl� de signature %s a expir� le %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "la signature de la cl� %s est suppos�e �tre fausse car un bit\n"
 "critique est inconnu\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "cl� %s: pas de sous-cl� pour la signature de r�vocation de sous-cl�\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "cl� %s: pas de sous-cl� pour la signature de liaison � la\n"
 "sous-cl�\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"impossible de mettre des donn�es de notation dans des signatures v3\n"
-"(de style PGP 2.x)\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"impossible de mettres des donn�es de notation dans des signatures de\n"
-"cl�s v3 (de style PGP 2.x)\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion � base de %%\n"
 "(cha�ne trop grande). Utilisation de la version non expans�e.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"impossible de mettre une URL de politique dans des signatures v3\n"
-"(de style PGP 2.x)\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"impossible de mettre une URL de politique dans des signatures de cl� v3\n"
-"(de style PGP 2.x)\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5722,7 +5703,7 @@ msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion � base de %% de l'URL\n"
 "de politique (trop grande). Utilisation de la version non expans�e.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5731,23 +5712,23 @@ msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion � base de %% de l'URL\n"
 "de politique (trop grande). Utilisation de la version non expans�e.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature de: � %s �\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible g�n�rer une signature d�tach�e avec des cl�s de\n"
 "style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5755,53 +5736,53 @@ msgstr ""
 "AVERTISSEMENT: forcer l'algorithme de hachage %s (%d) entre en\n"
 "d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature en texte clair avec des cl�s\n"
 "de style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilis�\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la cl� n'est pas marqu�e comme non-s�re; on ne peut pas l'utiliser avec le\n"
 "pseudo-g�n�rateur de nombres al�atiores !\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "� %s � a �t� ignor�: dupliqu�\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "� %s � a �t� ignor�: %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "ignor�: cl� secr�te d�j� pr�sente\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "c'est une cl� ElGamal g�n�r�e par PGP qui n'est pas s�re pour\n"
 "les signatures !"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "enregistrement de confiance %lu, type %d: l'�criture a �chou�: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5810,344 +5791,344 @@ msgstr ""
 "# Liste des valeurs de confiance assign�es, cr��e le %s\n"
 "# (Utilisez � gpg --import-ownertrust � pour les restaurer)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "erreur dans `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "ligne trop longue"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "symbole deux-points manquant"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "empreinte invalide"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "valeur de confiance au propri�taire manquante"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr ""
 "erreur pendant la recherche de l'enregistrement de confiance\n"
 "dans `%s': %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "erreur de lecture dans `%s': %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance: la synchronisation a �chou�: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "enregistrement de base de confiance %lu: lseek a �chou�: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "enregistrement de la base de confiance %lu: l'�criture a �chou� (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "transaction de base de confiance trop volumineuse\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: le r�pertoire n'existe pas !\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "impossible de cr�er un verrou pour `%s'\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "impossible de verrouiller `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: impossible de cr�er un enregistrement de version: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: base de confiance invalide cr��e\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: base de confiance cr��e\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTE: la base de confiance n'a pas les permissions d'�criture\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de confiance invalide\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: la cr�ation de la table de hachage a �chou�: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erreur pendant la mise � jour de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erreur pendant la lecture de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erreur pendant l'�criture de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de confiance: �lseek()� a �chou�: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de confiance: la lecture a �chou� (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ce n'est pas un fichier de base de confiance\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: enregistrement de version avec un num�ro %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: version %d du fichier invalide\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erreur pendant la lecture de l'enregistrement libre: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 "%s: erreur pendant l'�criture de l'enregistrement de\n"
 "r�pertoire: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: n'a pu mettre un enregistrement � z�ro: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: impossible d'ajouter un enregistrement: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la base de confiance est corrompue; ex�cutez �gpg --fix-trustdb�.\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "impossible de traiter les lignes plus longues que %d caract�res\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "la ligne d'entr�e est plus longue que %d caract�res\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' n'est pas une identification de cl� longue valide\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "cl� %s: accept�e comme cl� de confiance.\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "la cl� %s appara�t plusieurs fois dans la base de confiance\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "cl� %s: pas de cl� publique pour la cl� de confiance - ignor�e\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "cl� %s marqu�e comme ayant une confiance ultime.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 "enregistrement de confiance %lu, type de requ�te %d: la lecture a �chou�: %"
 "s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "l'enregistrement de confiance %lu: n'est pas du type demand� %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "impossible d'utiliser ce mod�le de confiance inconnu (%d) -\n"
 "on utilise � la place le mod�le de confiance %s\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "utilisation du mod�le de confiance %s\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "11 le traducteur a bien lu ce qu'il fallait :)"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[ revoqu�e]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[ expir�e ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[ inconnue]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[ind�finie]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[marginale]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[ enti�re ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[  ultime ]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "ind�finie"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "jamais"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "marginale"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "enti�re"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "ultime"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "v�rification de la base de confiance inutile\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la prochaine v�rification de la base de confiance aura lieu le %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "v�rification de la base de confiance inutile avec le mod�le de\n"
 "confiance `%s'\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "mise � jour de la base de confiance inutile avec le mod�le de\n"
 "confiance `%s'\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "cl� publique %s non trouv�e : %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "faites un --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "v�rifier la base de confiance\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d cl�s trait�es (%d comptes de validit� r�initialis�s)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "aucune cl� de confiance ultime n'a �t� trouv�e\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "la cl� publique de la cl� de confiance ultime %s est introuvable\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d marginale(s) n�cessaires, %d compl�te(s) n�cessaires, mod�le\n"
 "de confiance %s\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6155,14 +6136,14 @@ msgstr ""
 "profondeur: %d  valide: %3d  sign�: %3d\n"
 "confiance: %d-. %dg. %dn. %dm. %df. %du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "impossible de mettre � jour l'enregistrement de version de la\n"
 "base de confiance: l'�criture a �chou�: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6179,308 +6160,328 @@ msgstr ""
 "la ligne d'entr�e %u est trop longue ou il manque un caract�re de saut\n"
 "de ligne\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "erreur g�n�rale"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "type de paquet inconnu"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "version inconnue"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "algorithme � cl� publique inconnu"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "algorithme de hachage inconnu"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "mauvaise cl� publique"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "mauvaise cl� secr�te"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "mauvaise signature"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "somme de contr�le erron�e"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "mauvaise phrase de passe"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "cl� publique non trouv�e"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "algorithme de chiffrement inconnu"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "impossible d'ouvrir le porte-cl�s"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "paquet invalide"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "armure invalide"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "pas d'utilisateur de ce nom"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "la cl� secr�te n'est pas disponible"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "mauvaise cl� secr�te utilis�e"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "non support�"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "mauvaise cl�"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "erreur de lecture"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "erreur d'�criture"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "algorithme de compression inconnu"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "erreur d'ouverture de fichier"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "erreur de cr�ation de fichier"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "phrase de passe invalide"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "algorithme � cl� publique non implant�"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "algorithme de chiffrement non implant�"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "classe de signature inconnue"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "erreur dans la base de confiance"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "mauvais entier en pr�cision multiple (MPI)"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "limite de ressources atteinte"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "porte-cl�s invalide"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "mauvais certificat"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "nom d'utilisateur malform�"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "erreur de fermeture de fichier"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "erreur pendant le changement de nom du fichier"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "erreur pendant la suppression du fichier"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "donn�es inattendues"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "conflit de dates"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "algorithme de cl�s publiques inutilisable"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "le fichier existe"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "cl� faible"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "argument invalide"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "mauvaise adresse (URI)"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "URI non support�e"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "erreur de r�seau"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "non chiffr�"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "non trait�"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "cl� publique inutilisable"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "cl� secr�te inutilisable"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "erreur du serveur de cl�s"
 
-#: util/errors.c:109
+#: util/errors.c:107
 msgid "canceled"
 msgstr "annul�"
 
-#: util/errors.c:110
+#: util/errors.c:108
 msgid "no card"
 msgstr "pas de carte"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "pas de donn�es sign�es\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr "ERREUR: "
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr "AVERTISSEMENT: "
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... c'est un bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouv� un bug... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "oui"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "oO"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "non"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "quitter"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr "ok|ok"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr "annuler|annuler"
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 msgid "cC"
 msgstr "aA"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "AVERTISSEMENT: l'utilisation de la m�moire n'est pas s�re !\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 "l'op�ration n'est pas possible tant que la m�moire s�re n'est pas\n"
 "initialis�e\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(vous avez peut-�tre utilis� un programme non adapt� � cette fin)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "impossible de mettre des donn�es de notation dans des signatures v3\n"
+#~ "(de style PGP 2.x)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "impossible de mettres des donn�es de notation dans des signatures de\n"
+#~ "cl�s v3 (de style PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "impossible de mettre une URL de politique dans des signatures v3\n"
+#~ "(de style PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "impossible de mettre une URL de politique dans des signatures de cl� v3\n"
+#~ "(de style PGP 2.x)\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr ""
 #~ "DSA n�cessite l'utilisation d'un algorithme de hachage de 160 bits\n"
diff --git a/po/gl.po b/po/gl.po
index 5a9ef0f4f..016c664e0 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,4 +1,4 @@
-# Galician translation of GNUpg
+# Galician translation of GnuPG
 # Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
 # Jacobo Tarrio <[email protected]>, 2001, 2002, 2003.
 #
@@ -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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -14,90 +14,90 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "non se pode xerar un n�mero primo de menos de %d bits\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "non se pode xerar un n�mero primo de menos de %d bits\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "non se detectou un m�dulo de acumulaci�n de entrop�a\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "non se puido facer stat sobre `%s': %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' non � un ficheiro normal - ign�rase\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "nota: o ficheiro random_seed est� baleiro\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVISO: tama�o do ficheiro random_seed non v�lido - non se emprega\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "non se pode ler de `%s': %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "nota: o ficheiro random_seed non se actualiza\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "non se pode escribir en `%s': %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: ��empr�gase un xerador de n�meros aleatorios inseguro!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -112,7 +112,7 @@ msgstr ""
 "�NON USE NINGUN DATO XERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -122,7 +122,7 @@ msgstr ""
 "pouco se iso evita que se aburra, que iso ha aumenta-la\n"
 "calidade da entrop�a.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -134,62 +134,62 @@ msgstr ""
 "traballo para lle dar ao sistema operativo unha oportunidade de acumular\n"
 "m�is entrop�a (Prec�sanse %d bytes m�is)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -197,364 +197,369 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 #, fuzzy
 msgid "generating new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "cabeceira de armadura non v�lida: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "cabeceira de armadura: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "cabeceira de sinatura en claro non v�lida\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "cabeceira de armadura: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "sinaturas en texto claro ani�adas\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "li�a escapada cunha barra non v�lida: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "car�cter radix64 non v�lido %02x omitido\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "fin de ficheiro prematura (non hai CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "fin de ficheiro prematura (no CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "CRC mal formado\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fin de ficheiro prematura (nas li�as adicionais)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "error nunha li�a adicional\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: li�a m�is longa ca %d caracteres\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "car�cter quoted-printable na armadura - seguramente empregouse un MTA con "
 "erros\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "a chave secreta non est� dispo�ible"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "unspecified"
 msgstr "Non se especificou un motivo"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 #, fuzzy
 msgid "not forced"
 msgstr "non procesado"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Pegada dactilar:"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -562,301 +567,301 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "list all available data"
 msgstr "Chave dispo�ible en: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia-la fecha de expiraci�n"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 #, fuzzy
 msgid "generate new keys"
 msgstr "xerar un novo par de chaves"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "a chave secreta non est� dispo�ible"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita o contrasinal: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a menos que especifique a chave por pegada dactilar)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr ""
 "iso non se pode facer no modo de procesamento por lotes sen \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "�Borrar esta chave do chaveiro? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "�Esta � unha chave secreta! - �est� seguro de que quere borrala? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "borrouse a informaci�n de confianza\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "empregue a opci�n \"--delete-secret-keys\" para borrala primeiro.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "non se pode empregar un paquete sim�trico ESK debido ao modo S2K\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � un ficheiro baleiro\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "s� pode cifrar a chaves RSA de 2048 bits ou menos en modo --pgp2\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "non se puido emprega-la cifra IDEA para t�dalas chaves �s que est� a "
 "cifrar.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -865,172 +870,172 @@ msgstr ""
 "forza-lo algoritmo de compresi�n %s (%d) viola as preferencias do "
 "destinatario\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "AVISO: cifrouse a mensaxe cunha chave feble no cifrado sim�trico.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao manexa-lo paquete cifrado\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "non se soporta a execuci�n remota de programas\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "as chamadas a programas externos est�n desactivadas debido a opci�ns de "
 "permisos de ficheiros non seguras\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "esta plataforma precisa de ficheiros temporais ao chamar a programas "
 "externos\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "non se puido executar %s \"%s\": %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "non se puido executar %s \"%s\": %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "erro do sistema ao chamar a un programa externo: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "sa�da non natural do programa externo\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "non se puido executar un programa externo\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "non se puido le-la resposta do programa externo: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: non se puido elimina-lo directorio temporal `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "non se atoparon chaves de revocaci�n para `%s'\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revocar unha chave secundaria"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "chave secreta non utilizable"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: non est� protexida - omitida\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "AVISO: a chave secreta %08lX non ten unha suma de comprobaci�n SK simple\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1038,128 +1043,128 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocaci�n"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "actualizar t�dalas chaves dun servidor de chaves"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1169,51 +1174,51 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "lareto"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1221,7 +1226,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1241,17 +1246,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <[email protected]>,\n"
 "e dos erros na traducci�n a <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1261,7 +1266,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1269,647 +1274,647 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro est� unha chave listada"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "non se cargou a extensi�n de cifrado \"%s\" debido a permisos inseguros\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
 "activado.\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "para cifrar unha mensaxe en modo --pgp2 prec�sase da cifra IDEA\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de compresi�n \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiadas entradas na cach� de chaves p�blicas - desactivada\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Non se atopou o id de usuario]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "non hai unha sub-chave secreta para a sub-chave p�blica %08lX - ign�rase\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "toma-las chaves deste chaveiro"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "converte-los conflictos de selo de data nun aviso"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la informaci�n de estado a este DF"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1917,7 +1922,7 @@ msgstr ""
 "Sintaxe: gpg [opci�ns] [ficheiros]\n"
 "Comproba as sinaturas contra chaves de confianza co�ecidas\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1927,7 +1932,7 @@ msgstr ""
 "a ning�n terceiro. Prec�sase para implementa-la rede de confianza; non ten\n"
 "nada que ver coa rede de certificados."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1938,16 +1943,16 @@ msgstr ""
 "confianza absoluta - esas adoitan se-las chaves das que ten acceso � chave\n"
 "secreta. Responda \"si\" para lle dar confianza total a esta chave\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Se desexa empregar esta clave na que non se conf�a, conteste \"si\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Introduza o ID de usuario da persoa � que lle quere manda-la mensaxe."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1961,7 +1966,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1971,16 +1976,16 @@ msgstr ""
 "Este algoritmo deber�a empregarse s� en determinados dominios.\n"
 "Consulte antes co seu experto en seguridade."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Introduza o tama�o da chave"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Conteste \"si\" ou \"non\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1992,19 +1997,19 @@ msgstr ""
 "boa resposta de erro - no canto diso, o sistema ha tratar de interpreta-lo\n"
 "valor proporcionado coma se fora un intervalo."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Introduza o nome do propietario da chave"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "por favor, introduza un enderezo de e-mail (opcional pero recomendado)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Por favor, introduza un comentario (opcional)"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2018,11 +2023,11 @@ msgstr ""
 "O  para continuar coa xeraci�n da chave.\n"
 "S  para sa�r da xeraci�n da chave."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Conteste \"si\" (ou s� \"s\") se � correcto xerar esta subchave."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2095,12 +2100,12 @@ msgstr ""
 "\n"
 "Se non sabe cal � a resposta correcta, resposte \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Conteste \"si\" se quere asinar T�DOLOS IDs de usuario"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2108,11 +2113,11 @@ msgstr ""
 "Conteste \"si\" se realmente desexa borrar este ID de usuario.\n"
 "�Tam�n se han perder t�dolos certificados!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Conteste \"si\" se � correcto borrar esta subchave"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2122,7 +2127,7 @@ msgstr ""
 "sinatura porque pode ser importante para estabrecer unha conexi�n de\n"
 "confianza na chave ou noutra chave certificada por esta chave."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2134,13 +2139,13 @@ msgstr ""
 "se empregou porque esta chave de sinatura poder�a estabrecer unha\n"
 "conexi�n de confianza mediante outra chave xa certificada."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "A sinatura non � correcta. Ten sentido borrala do chaveiro."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2154,7 +2159,7 @@ msgstr ""
 "s� se esta auto-sinatura non � correcta por algun motivo e hai\n"
 "unha segunda � s�a disposici�n."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2164,24 +2169,24 @@ msgstr ""
 "� lista actual de preferencias. A marca de tempo de t�dalas auto-sinaturas\n"
 "afectadas ha avanzar un segundo.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Por favor, repita o �ltimo contrasinal, para estar seguro do que tecleou."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Introduza o nome do ficheiro ao que corresponde a sinatura"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Conteste \"si\" se � correcto sobrescribi-lo ficheiro"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2189,7 +2194,7 @@ msgstr ""
 "Por favor, introduza un novo nome de ficheiro. Se s� preme ENTER, hase\n"
 "emprega-lo ficheiro por defecto (que se amosa entre corchetes)."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2217,7 +2222,7 @@ msgstr ""
 "     Empr�gueo para indicar que o ID de usuario xa non se deber�a empregar;\n"
 "     adoita empregarse para marcar un enderezo de correo non v�lido.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2227,546 +2232,546 @@ msgstr ""
 "certificado de revocaci�n. Por favor, mante�a este texto breve.\n"
 "Unha li�a en branco remata o texto.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Non hai axuda dispo�ible"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non hai axuda dispo�ible para `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "chave secreta non utilizable"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "pasando por alto un bloque de tipo %d\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves procesadas hasta polo momento\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total procesado: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "novas chaves omitidas: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "   sin IDs de usuario: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importadas: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          sin cambios: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr " novos IDs de usuario: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "     novas sub-chaves: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         novas sinaturas: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " novas revocaci�ns de chaves: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chaves secretas importadas: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chaves secretas sin cambios: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       non importadas: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         novas sinaturas: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: arranxouse a corrupci�n da sub-chave HKP\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: non hai IDs de usuario v�lidos\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica non atopada: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible le-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" sen cambios\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta cunha cifra %d non v�lida - omitida\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: xa estaba no chaveiro secreto\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: non hai chave p�blica - non se pode aplica-lo\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "chave %08lX: certificado de revocaci�n incorrecto:\n"
 "%s - rechazado\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica non soportado no ID de usuario \"%s"
 "\"\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: auto-sinatura non v�lida no identificadr de usuario \"%s\"\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: non hai sub-chave para a ligaz�n da chave\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: eliminouse unha ligaz�n de sub-chave m�ltiple\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: non hai unha sub-chave para a revocaci�n da chave\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revocaci�n de sub-chave non v�lida\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: eliminouse a revocaci�n de sub-chaves m�ltiples\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: omitido o ID de usuario '"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: omitida a sub-chave\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n no lugar err�neo - omitido\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n incorrecto: %s - omitido\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n %"
 "08lX\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
 "ausente.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "chaveiro `%s' creado\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[auto-sinatura]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 sinatura err�nea\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d sinaturas err�neas\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 sinatura non verificada debido a unha chave que falta\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d sinaturas non verificadas debido a chaves que faltan\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 sinatura non verificada debido a un erro\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d sinaturas non verificadas debido a erros\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "detectado 1 ID de usuario sin auto-sinatura v�lida\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "detectados %d IDs de usuario sin auto-sinatura v�lida\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2778,63 +2783,63 @@ msgstr ""
 "correctamente as chaves de outros usuarios (mirando nos pasaportes,\n"
 "comprobando pegadas dactilares de varias fontes...).\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Conf�o marxinalmente\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Est� seguro de que quere asinalo? (s/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "O ID de usuario \"%s\" est� caducado."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2843,11 +2848,11 @@ msgstr ""
 "A auto-sinatura de \"%s\"\n"
 "� unha sinatura tipo PGP 2.x\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "�Quere promovela a unha auto-sinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2856,11 +2861,11 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "caducou.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quere emitir unha nova sinatura que substit�a � caducada? (s/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2869,54 +2874,54 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "� unha sinatura local.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "�Quere promovela a sinatura totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quere asinalo outra vez de t�dolos xeitos? (s/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "�Esta chave caducou!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave ha caducar o %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quere que a s�a sinatura caduque ao mesmo tempo? (S/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Non pode facer unha sinatura OpenPGP nunha chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto poder�a face-la chave non utilizable en PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2925,32 +2930,32 @@ msgstr ""
 "�Con canto tino comprobou que a chave que vai asinar realmente pertence �\n"
 "persoa de enriba? Se non sabe que respostar, introduza \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Non hei respostar.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non o comprobei en absoluto.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Fixen algunhas comprobaci�ns.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�A s�a elecci�n? (introduza '?' para ter m�is informaci�n): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2959,100 +2964,100 @@ msgstr ""
 "�Esta seguro de que quere asinar esta chave\n"
 "coa s�a chave: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Esta ha ser unha auto-sinatura.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a sinatura non se ha marcar coma non exportable.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: A sinatura non se ha marcar coma non revocable.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non exportable.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non se comprobou esta chave en absoluto.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave de xeito informal.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave con moito tino.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Non se pode editar esta chave: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3060,11 +3065,11 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3072,212 +3077,212 @@ msgstr ""
 "Non desexa un contrainal - �o que � unha *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Seguro que quere facer esto? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a sinatura dunha chave � seu sitio\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "gardar e sa�r"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "asina-la chave localmente"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "engadir unha identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "borrar un ID de usuario"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "engadir unha chave de revocaci�n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre o listado de chaves p�blicas e secretas"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar un ID de usuario"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "enable key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "disable key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "amosa-la identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "A chave secreta est� disponible.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "C�mpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3285,243 +3290,243 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "A chave est� revocada."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "clase de sinatura desco�ecida"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere borrar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Seguro de que quere revocar este ID de usuario? "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�Garda-los cambios? "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�Sa�r sin gardar? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaci�n: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3529,19 +3534,19 @@ msgstr ""
 "Te�a en conta que a validez da chave amosada non � necesariamente\n"
 "correcta a menos que reinicie o programa.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3549,7 +3554,7 @@ msgstr ""
 "AVISO: non se marcou ning�n ID de usuario coma primario. Esta orde pode\n"
 "              facer que un ID de usuario diferente se converta no primario.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3558,77 +3563,77 @@ msgstr ""
 "AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
 "       fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non pode engadir unha identificaci�n fotogr�fica a unha chave de estilo "
 "PGP2.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non v�lida"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3638,378 +3643,378 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "�Est� seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�Sobrescribir? (s/N) "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   asinada por %08lX no %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? (s/N) "
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Amosando a id. fotogr�fica %s de tama�o %ld da chave 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferencia %c%lu duplicada\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "escribindo unha sinatura directa\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "escribindo a propia sinatura\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de chave non v�lido; empregando %u bits\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de chave redondeado a %u bits\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar datos"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s� asinar)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s� asinar)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ha ter 1024 bits.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�Qu� tama�o de chave quere? (1024) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tama�o de chave requerido son %u bits\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4025,7 +4030,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4041,40 +4046,40 @@ msgstr ""
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a chave? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�Por canto tempo � v�lida a sinatura? (0) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "valor non v�lido\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4082,12 +4087,12 @@ msgstr ""
 "O seu sistema non pode amosar datas m�is al� do 2038.\n"
 "A�nda as�, hase tratar correctamente ata o 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�Isto � correcto? (s/n) "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 #, fuzzy
 msgid ""
 "\n"
@@ -4104,44 +4109,44 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Caracter non v�lido no nome\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun d�xito\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Car�cter non v�lido no comentario\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4152,7 +4157,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor, non po�a o enderezo de correo no nome real ou no comentario\n"
@@ -4168,23 +4173,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)a�r? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)a�r? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4192,12 +4197,12 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4209,7 +4214,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4221,50 +4226,50 @@ msgstr ""
 "mentres se xeran os n�meros primos; isto proporci�nalle ao xerador de\n"
 "n�meros aleatorios unha opoertunidade de acumular entrop�a de abondo.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non se atopou un chaveiro p�blico no que se poida escribir: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "cre�ronse e asin�ronse as chaves p�blica e secreta.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4274,12 +4279,12 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4287,7 +4292,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4295,697 +4300,697 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a creaci�n de subchaves para chaves v3 non cumpre OpenPGP\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�Crear realmente? "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "nunca     "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Normativa de sinaturas cr�ticas: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Normativa de sinaturas: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Notaci�n de sinaturas cr�ticas: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Chaveiro"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Pegada dactilar ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existen dous ficheiros con informaci�n confidencial.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o que non cambiou\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor, ama�e este posible fallo de seguridade\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "comprobando o chaveiro `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro creado\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "asinado coa s�a chave %08lX no %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 "non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non � un ID de chave v�lido\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, 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:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chave de sesi�n cifrada con %s\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave p�blica: DEK correcto\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave p�blica: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu contrasinais\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 contrasinal\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supo�endo datos cifrados con %s\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensaxe non ti�a protecci�n de integridade\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: �a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "verificaci�n de sinatura suprimida\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "non se poden manexar estas sinaturas m�ltiples\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "Chave dispo�ible en: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               alias \""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "desco�ecido"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "non � unha sinatura separada\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 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:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "non � posible deshabilita-los volcados de 'core': %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 "a actualizaci�n da base de datos de confianza fallou:\n"
 "%s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de cifrado non implementado"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o plugin de cifra IDEA non est� presente\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = amosar m�is informaci�n\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n a extinguir \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "empregue \"%s%s\" no seu canto\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensaxe pode non ser utilizable por %s\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "O ficheiro `%s' xa existe. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "�Sobrescribir? (s/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desco�ecido\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Introduza o novo nome de ficheiro"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "escribindo na sa�da est�ndar\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "suponse que hai datos asinados en `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, 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"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: chave de sesi�n cifrada simetricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema co axente - desactivando o emprego do axente\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4996,28 +5001,28 @@ msgstr ""
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Repita o contrasinal\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Introduza o contrasinal\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "non se pode consulta-lo contrasinal en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Introduza o contrasinal: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5027,21 +5032,21 @@ msgstr ""
 "Necesita un contrasinal para desbloquea-la chave secreta para\n"
 "o usuario \""
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits, chave %s, ID %08lX, creada %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Repita o contrasinal: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5055,164 +5060,164 @@ msgstr ""
 "p�blica. Se emprega unha imaxe moi grande, a s�a chave tam�n se ha volver\n"
 "moi grande. Un bo tama�o para empregar � un semellante a 240x288.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduza o nome do ficheiro JPEG: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" non � un ficheiro JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "�� esta foto correcta (s/N/q)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "�non se pode amosa-la identificaci�n fotogr�fica!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "A chave � obsoleta"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "Esta chave quedou descoberta"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "Xa non se emprega esta chave"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "O ID de usuario xa non � v�lido"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "motivo para a revocaci�n: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "comentario de revocaci�n: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMsSoO"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Non se asignou un valor de confianza a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Esta chave probablemente pertenza ao propietario\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Non sei\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NON conf�o\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Conf�o absolutamente\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = voltar ao men� principal\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " o = omitir esta chave\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " s = sa�r\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "�A s�a decisi�n? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "�Est� seguro de querer dar confianza absoluta a esta chave? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que conducen a unha chave de confianza absoluta:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta chave probablemente pertenza ao propietario\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Esta chave pert�ncenos a n�s\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5224,114 +5229,114 @@ msgstr ""
 "respostar � seguinte pregunta cun \"si\"\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "�Empregar esta chave de t�dolos xeitos?"
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: �Empr�gase unha chave que non � de confianza!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
 "ausente.\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "       Isto pode significar que a sinatura est� falsificada.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: �Esta subchave est� revocada polo propietario!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta chave est� desactivada.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta chave xa caducou!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: �Esta chave non est� certificada cunha sinatura de confianza!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "       Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: �Esta chave NON � de confianza!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "       Probablemente, a sinatura estea FALSIFICADA.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: �Esta chave non est� certificada con sinaturas de suficiente "
 "confianza!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       Non � seguro que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitido: a chave p�blica xa est� presente\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non especificou un ID de usuario. (pode empregar \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5339,169 +5344,169 @@ msgstr ""
 "\n"
 "Introduza o ID de usuario. Remate cunha li�a en branco: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Non hai tal ID de usuario.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "omitido: a chave p�blica xa est� estabrecida coma destinatario por defecto\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desactivada.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "omitido: chave p�blica xa estabrecida\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitido: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "non hai enderezos v�lidos\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "os datos non foron gardados; use a opci�n \"--output\" para gardalos\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Sinatura non adxunta.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Por favor, introduza o nome do ficheiro de datos: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "lendo de stdin ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "non hai datos asinados\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinatario an�nimo; tentando a chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "vale, n�s somo-lo destinatario an�nimo.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "a codificaci�n vella do DEK non est� soportada\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "o algoritmo de cifrado %d%s � desco�ecido ou est� desactivado\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: o algoritmo de cifrado %d non foi atopado nas preferencias\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave est� revocada"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "a chamada a build_packet fallou: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Ha ser revocada por:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Esta � unha chave de revocaci�n sensible)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "Forzouse unha sa�da con armadura ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "a chamada a make_keysig_packet fallou: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Creouse o certificado de revocaci�n.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "non se atoparon chaves de revocaci�n para `%s'\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave secreta `%s': %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: �Esta chave non est� protexida!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5519,124 +5524,124 @@ msgstr ""
 "se volve ilexible. Pero te�a coidado: o sistema de impresi�n da s�a\n"
 "m�quina poder�a armacena-los datos e deix�rllelos dispo�ibles a outros.\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(probablemente queira seleccionar %d aqu�)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduza unha descrici�n opcional; rem�tea cunha li�a en branco:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo para a revocaci�n: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(Non se deu unha descrici�n)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "�� correcto? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "hai partes da chave secreta non dispo�ibles\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Contrasinal non v�lido; por favor, t�nteo de novo"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Detectouse unha chave feble - por favor, cambie o contrasinal outra "
 "vez.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "xerando o checksum de 16-bits a extinguir para a protecci�n da chave "
 "secreta\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "creouse unha chave feble - volvendo a tentalo\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "non se pode evitar unha chave feble para o cifrado sim�trico; tentouse %d "
 "veces\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflicto de resumo de sinatura na mensaxe\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica %08lX � %lu segundos m�is nova c� sinatura\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5644,7 +5649,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5652,141 +5657,119 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: a chave de sinatura %08lX caducou o %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "asumindo unha sinatura incorrecta da chave %08lX debido a un bit cr�tico "
 "desco�ecido\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "chave %08lX: non hai unha sub-chave para o paquete de a revocaci�n de "
 "subchave\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: non hai sub-chave para a sinatura da ligaz�n da chave\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"non se pode po�er datos de notaci�n nas sinaturas v3 (estilo PGP 2.x)\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"non se pode po�er datos de notaci�n nas sinaturas de chave v3 (estilo PGP 2."
-"x)\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVISO: non se pode expandir-%% a notaci�n (grande de m�is). �sase sen "
 "expandir.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"non se pode po�er un URL de pol�tica nas sinaturas v3 (estilo PGP 2.x)\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"non se pode po�er un URL de pol�tica nas sinaturas de chave v3 (estilo PGP 2."
-"x)\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Sinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s� pode asinar nun ficheiro separado con chaves estilo PGP 2.x no modo --"
 "pgp2\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode asinar en claro con chaves estilo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave non est� marcada coma insegura - non se pode empregar co xerador de "
 "n�meros aleatorios falso\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "om�tese `%s': duplicada\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "om�tese `%s': %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "om�tese `%s': �esta � unha chave ElGamal xerada por PGP que non � segura "
 "para sinaturas!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5795,351 +5778,351 @@ msgstr ""
 "# Lista de valores de confianza asignados, creada o %s\n"
 "# (Empregue \"gpg --import-ownertrust\" para restauralos)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "li�a longa de m�is\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importa-los valores de confianza no propietario"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "erro ao buscar un rexistro de confianza: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "erro de lectura: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallou a sincronizaci�n: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "rexistro da base de datos de confianza %lu: lseek fallou: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "rexistro da base de datos de confianza %lu: fallou a escritura (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "transacci�n da base de datos de confianza demasiado grande\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �o directorio non existe!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: non se puido crea-lo rexistro de versi�n: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: creouse unha base de datos de confianza incorrecta\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creouse a base de datos de confianza\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: non se pode escribir na base de datos de confianza\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza non v�lida\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro ao actualiza-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao le-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: lseek fallou: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un ficheiro de base de datos de confianza\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: rexistro de versi�n con n�mero de rexistro %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n do ficheiro incorrecta %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: non se puido p�r a cero un rexistro: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: non se puido engadir un rexistro: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "a base de datos de confianza est� corrompida; execute \"gpg --fix-trustdb"
 "\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "non � posible manexar li�as de texto maiores que %d caracteres\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "a li�a de entrada cont�n m�is de %d caracteres\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' non � un ID longo de chave v�lido\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceptada como chave de confianza\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "a chave %08lX aparece m�is dunha vez na base de datos de confianza\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chave %08lX: non hai unha chave p�blica para a chave de confianza - omitida\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "chave marcada coma de confianza absoluta.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo da petici�n %d: fallou a lectura: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "o rexistro de confianza %lu non � do tipo %d solicitado\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocada] "
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "desco�ecido"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "nunca     "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "hase comproba-la base de datos de confianza o %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "non se atopou a chave p�blica %08lX: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "por favor, execute con --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "proces�ronse %d chaves (marc�ronse %d contas de validez)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "non se atoparon chaves de confianza absoluta\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "non se atopou a chave p�blica da clave de confianza absoluta %08lX\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 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:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6155,309 +6138,327 @@ 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"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "erro xeral"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "tipo de paquete desco�ecido"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "versi�n desco�ecida"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "algoritmo de chave p�blica desco�ecido"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "algoritmo de resumo desco�ecido"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "chave p�blica err�nea"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "chave secreta err�nea"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "sinatura err�nea"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "error de checksum"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "contrasinal err�neo"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "non se atopou a chave p�blica"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "algoritmo de cifrado desco�ecido"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "non foi posible abri-lo chaveiro"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "paquete non v�lido"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "armadura non v�lida"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "non hai tal id de usuario"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "a chave secreta non est� dispo�ible"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "empregouse unha chave secreta err�nea"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "non est� soportado"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "chave incorrecta"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "erro de lectura de ficheiro"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "erro de escritura de ficheiro"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "algoritmo de compresi�n desco�ecido"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "erro de apertura de ficheiro"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "erro de creaci�n de ficheiro"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "contrasinal incorrecto"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmo de chave p�blica non implementado"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "algoritmo de cifrado non implementado"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "clase de sinatura desco�ecida"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "erro da base de datos de confianza"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "MPI err�neo"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "l�mite de recursos"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "chaveiro incorrecto"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "certificado err�neo"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "id de usuario mal formado"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "erro de peche de ficheiro"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "erro de cambio de nome de ficheiro"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "erro de borrado de ficheiro"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "datos inesperados"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "conflicto de selo de data"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "algoritmo de chave p�blica imposible de usar"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "o ficheiro xa existe"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "chave feble"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "argumento non v�lido"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "URI incorrecto"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "URI non soportado"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "erro de rede"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "non cifrado"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "non procesado"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "chave p�blica non utilizable"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "chave secreta non utilizable"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "erro do servidor de chaves"
 
-#: util/errors.c:109
+#: util/errors.c:107
 #, fuzzy
 msgid "canceled"
 msgstr "Cancelar"
 
-#: util/errors.c:110
+#: util/errors.c:108
 #, fuzzy
 msgid "no card"
 msgstr "non cifrado"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "non hai datos asinados\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... isto � un erro (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "atopou un erro ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "si|sim"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "non|nom"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "abandonar"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "aA"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 #, fuzzy
 msgid "cC"
 msgstr "v"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "AVISO: ��sase memoria insegura!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "mire en http://www.gnupg.org/faq.html para obter m�is informaci�n\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a operaci�n non � posible sen memoria inicializada como segura\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "non se pode po�er datos de notaci�n nas sinaturas v3 (estilo PGP 2.x)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "non se pode po�er datos de notaci�n nas sinaturas de chave v3 (estilo PGP "
+#~ "2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "non se pode po�er un URL de pol�tica nas sinaturas v3 (estilo PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "non se pode po�er un URL de pol�tica nas sinaturas de chave v3 (estilo "
+#~ "PGP 2.x)\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
 
diff --git a/po/hu.po b/po/hu.po
index 1b6e3fce3..9f6186a78 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -14,91 +14,91 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "Nem tudok l�trehozni %d bitesn�l kisebb pr�msz�mot.\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "Nem tudok l�trehozni %d bitesn�l kisebb pr�msz�mot.\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "Nem �szleltem entr�piagy�jt� modult.\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Nem tudom a stat m�veletet elv�gezni a(z) \"%s\" �llom�nyon: %s.\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" nem szab�lyos �llom�ny. Figyelmen k�v�l hagyom.\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr ""
 "Megjegyz�s: random_seed �llom�ny (v�letlensz�m-gener�tor �llapota) �res.\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "FIGYELEM: �rv�nytelen m�ret� random_seed �llom�ny. Nem haszn�lom.\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "Nem tudom olvasni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "Megjegyz�s: random_seed �llom�nyt nem friss�tettem.\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "Nem tudom �rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "FIGYELEM: Nem biztons�gos v�letlensz�m-gener�tort haszn�lok!!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -112,7 +112,7 @@ msgstr ""
 "NE HASZN�LJON SEMMILYEN ADATOT, AMIT EZ A PROGRAM EL��LL�T!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -121,7 +121,7 @@ msgstr ""
 "K�rem, v�rjon, entr�pi�t gy�jt�k! Vagy ink�bb csin�ljon k�zben valamit\n"
 "a g�pen, az az entr�pi�m min�s�g�t is jav�tani fogja!\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -133,62 +133,62 @@ msgstr ""
 "m�st, hogy az oper�ci�s rendszer entr�pi�t gy�jthessen!\n"
 "(M�g %d b�jt sz�ks�ges.)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -196,363 +196,368 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 #, fuzzy
 msgid "generating new key\n"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "P�nc�l: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "�rv�nytelen p�nc�lfejl�c: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "P�nc�lfejl�c: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "�rv�nytelen al��r�sfejl�c!\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "P�nc�lfejl�c: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "Egym�sba �gyazott olvashat�sz�veg-al��r�sok!\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "V�ratlan p�nc�l:"
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "�rv�nytelen k�t�jeles sor: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "Korai �llom�nyv�g (nincs CRC).\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "Korai �llom�nyv�g (a CRC-ben).\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "Hib�s form�j� CRC.\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC hiba; %06lx - %06lx\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "Korai �llom�nyv�g (a lez�r�sban).\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "Hiba a z�r� sorban!\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "�rv�nytelen p�nc�l: %d karaktern�l hosszabb sor.\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted printable karakter a p�nc�lban - val�sz�n�leg egy bugos MTA b�ne.\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "titkos kulcs nem �ll rendelkez�sre"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Mit v�laszt? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "unspecified"
 msgstr "Nincs megadva ok."
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 #, fuzzy
 msgid "not forced"
 msgstr "nem feldolgozott"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenci�k friss�t�se"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -560,466 +565,466 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the login name"
 msgstr "lej�rat megv�ltoztat�sa"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 #, fuzzy
 msgid "change the language preferences"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 #, fuzzy
 msgid "generate new keys"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Parancs> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "titkos kulcs nem �ll rendelkez�sre"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ism�telje meg a jelsz�t: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(Kiv�ve, ha megad egy kulcsot az ujjlenyomat�val.)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban \"--yes\" n�lk�l.\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "T�r�ljem ezt a kulcsot a kulcskarik�r�l? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Ez egy titkos kulcs! Val�ban t�r�ljem? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "Kulcstulajdonos megb�zhat�s�gi adatait t�r�ltem.\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "Van egy titkos kulcs a \"%s\" nyilv�nos kulcshoz!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "El�sz�r azt t�r�lje a \"--delete-secret-keys\" opci�val!\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "Nem tudok szimmetrikus ESK csomagot haszn�lni a S2K m�d miatt!\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "%s rejtjelez�st haszn�lok.\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "FIGYELEM: A(z) \"%s\" �llom�ny �res.\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "Csak 2048 bites, vagy r�videbb RSA kulcsokkal titkos�that --pgp2 m�dban!\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Olvasok a \"%s\" �llom�nyb�l.\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "Nem tudom az IDEA rejtjelez�t haszn�lni az �sszes c�mzett kulcshoz.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "A %s (%d) t�m�r�t�s haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s titkos�tott adat.\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "FIGYELEM: Az �zenet szimmetrikus titkos�t�s�t gyenge kulccsal v�gezt�k.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "Probl�ma a titkos�tott csomag kezel�sekor!\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "K�ls� program megh�v�sa nem t�mogatott.\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "A k�ls� programok h�v�sa tiltott, mert az \"options\" �llom�ny enged�lyei\n"
 "nem biztons�gosak.\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "Ez a platform �tmeneti �llom�nyokat ig�nyel k�ls� programok h�v�s�hoz.\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "Rendszerhiba k�ls� program h�v�sakor: %s.\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "A k�ls� program nem term�szetes m�don �rt v�get.\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "Nem tudom a v�grehajtani a k�ls� programot.\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "Nem tudom beolvasni a k�ls� program v�lasz�t: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "FIGYELEM: nem tudom t�r�lni a \"%s\" �tmeneti k�nyvt�rat: %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "Nem tal�ltam visszavon� kulcsot a k�vetkez�h�z: \"%s\".\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "m�sodlagos kulcs visszavon�sa"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "haszn�lhatatlan titkos kulcs"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "%08lX kulcs: nem v�dett - kihagytam.\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "%08lX kulcs: PGP 2.x st�lus� kulcs - kihagytam.\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "FIGYELEM: %08lX titkos kulcsnak nincs egyszer� SK ellen�rz��sszege.\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "FIGYELEM: Semmit sem export�ltam.\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1027,128 +1032,128 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "kulcsok �s al��r�sok list�z�sa"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "kulcs al��r�sa"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "kulcs al��r�sa helyileg"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "kulcs al��r�sa vagy szerkeszt�se"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs friss�t�se kulcsszerverr�l"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "kulcsok import�l�sa/�sszef�z�se"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1158,51 +1163,51 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|t�m�r�t�si szint be�ll�t�sa N-re (0: tilt�s)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "kimeneti �llom�ny megad�sa"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "fel�l�r�s el�tt r�k�rdez�s"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1210,7 +1215,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1230,15 +1235,15 @@ msgstr ""
 " --list-keys [nevek]        kulcsok ki�rat�sa\n"
 " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1248,7 +1253,7 @@ msgstr ""
 "Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
 "Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1256,645 +1261,645 @@ msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "A \"%s\" rejtjelez� b�v�t�st rossz enged�lyek miatt t�lt�m be.\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Nem tudom a v�grehajt�si el�r�si utat %s �rt�kre �ll�tani!\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "Csak k�l�n�ll� �s olvashat�sz�veg-al��r�st k�sz�thet --pgp2 m�dban!\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Nem �rhat al� �s titkos�that egyszerre --pgp2 m�dban!\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�zenet titkos�t�sa --pgp2 m�dban IDEA rejtjelez�t ig�nyel!\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�rv�nytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�rv�nytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" rejtjelez� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" kivonatol� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja \"%s\" t�m�r�t� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "FIGYELEM: C�mzett megadva (-r), de nincs nyilv�nos kulcs� titkos�t�s!\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "T�l sok bejegyz�s van a nyilv�noskulcs-gyors�t�t�rban - letiltom.\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[ismeretlen kulcs]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
 "--allow-non-selfsigned-uid opci�val.\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "Nincs titkos alkulcs a %08lX nyilv�nos alkulcshoz - figyelmen k�v�l hagyom.\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "m�g sz�kszav�bb m�d"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "a megadott kulcskarik�r�l vegye a kulcsokat"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "id�b�lyeg-konfliktus eset�n csak figyelmeztessen"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpgv [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1902,7 +1907,7 @@ msgstr ""
 "Szintaxis: gpg [opci�k] [f�jlok]\n"
 "Ellen�rzi az al��r�sokat az ismert, megb�zhat� kulcsok seg�ts�g�vel.\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1912,7 +1917,7 @@ msgstr ""
 "nem export�ljuk m�sok r�sz�re. Ez a bizalmak h�l�zat�hoz (web-of-trust)\n"
 "sz�ks�ges, semmi k�ze az igazol�sok h�l�zat�hoz (web-of-certificates)."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1924,18 +1929,18 @@ msgstr ""
 "melyek titkos kulcs�hoz hozz�f�r. V�laszoljon \"igen\"-nel, ha kulcsot\n"
 "alapvet�en megb�zhat�nak jel�li!\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Ha m�gis haszn�lni akarja ezt a kulcsot, melyben nem b�zunk,\n"
 "v�laszoljon \"igen\"-nel!"
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Adja meg a c�mzett felhaszn�l�i azonos�t�j�t!"
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1949,7 +1954,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1959,16 +1964,16 @@ msgstr ""
 "titkos�t�shoz. Ezt az algoritmust csak bizonyos ter�leteken aj�nlatos\n"
 "haszn�lni. K�rem, el�sz�r konzult�ljon a biztons�gi szak�rt�j�vel!"
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Adja meg a kulcs m�ret�t!"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "K�rem, adjon \"igen\" vagy \"nem\" v�laszt!"
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1980,19 +1985,19 @@ msgstr ""
 "hiba�zenetet kapni, hanem a rendszer megpr�b�lja az �rt�ket\n"
 "intervallumk�nt �rtelmezni."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Adja meg a kulcs tulajdonos�nak a nev�t!"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "K�rem, adjon meg egy opcion�lis, de nagyon aj�nlott e-mail c�met!"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "K�rem, adjon meg egy opcion�lis megjegyz�st!"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2006,13 +2011,13 @@ msgstr ""
 "R  kulcsgener�l�s folytat�sa\n"
 "Q  kil�p�s a kulcsgener�l�sb�l"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "V�laszoljon \"igen\"-nel (vagy csak \"i\"-vel), ha kezdhetj�k az alkulcs\n"
 "l�trehoz�s�t!"
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2086,13 +2091,13 @@ msgstr ""
 "\n"
 "Ha nem tudja, hogy mit v�laszoljon, �rjon \"0\"-t!"
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 "V�laszoljon \"igen\"-nel, ha az �SSZES felhaszn�l�azonos�t�t al� akarja �rni!"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2101,11 +2106,11 @@ msgstr ""
 "felhaszn�l�azonos�t�t!\n"
 "Minden igazol�s t�rl�dik vele egy�tt!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "V�laszoljon \"igen\"-nel, ha az alkulcs t�r�lhet�."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2115,7 +2120,7 @@ msgstr ""
 "t�r�lni, mert fontos lehet ahhoz, hogy �rv�nyes�tse ezt a kulcsot,\n"
 "vagy egy m�sikat, melyet ezzel a kulccsal igazolnak."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2127,13 +2132,13 @@ msgstr ""
 "hogy melyik kulcsot haszn�lt�k, mert ez az al��r� kulcs bizalmi\n"
 "kapcsolatot hozhat l�tre egy m�r hiteles�tett kulcson kereszt�l."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Ez az al��r�s nem �rv�nyes. �rtelmetlen elt�vol�tani a kulcskarik�r�l."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2147,7 +2152,7 @@ msgstr ""
 "a kulcsot. Csak akkor tegye ezt, ha valami okb�l ez az �nal��r�s nem\n"
 "�rv�nyes, �s rendelkez�sre �ll egy m�sik!"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2157,23 +2162,23 @@ msgstr ""
 "tartoz� preferenci�kat az aktu�lis preferenci�kra. Minden �rintett\n"
 "�nal��r�s id�pontj�t egy m�sodperccel n�veli.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "K�rem, ism�telje meg az el�z� jelsz�t ellen�rz�sk�ppen!"
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Adja meg az �llom�ny nev�t, melyhez az al��r�s tartozik!"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "V�laszoljon \"igen\"-nel, ha fel�l�rhat� az �llom�ny!"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2181,7 +2186,7 @@ msgstr ""
 "K�rem, adjon meg egy �j f�jlnevet! Ha RETURN-t/ENTER-t nyom, akkor\n"
 "a sz�gletes z�r�jelben lev� alap�rtelmezett nevet haszn�lom."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2209,7 +2214,7 @@ msgstr ""
 "      Haszn�lja ezt akkor, ha azt �ll�tja, hogy a felhaszn�l�azonos�t�\n"
 "      m�r nem haszn�latos! �ltal�ban �rv�nytelen e-mail c�met jelent.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2219,538 +2224,538 @@ msgstr ""
 "adta ki ezt a visszavon� igazol�st. K�rem, fogalmazzon t�m�ren!\n"
 "Egy �res sor jelzi a sz�veg v�g�t.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Nem �ll rendelkez�sre seg�ts�g."
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "haszn�lhatatlan titkos kulcs"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d t�pus� blokkot kihagyom.\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "     �sszesen feldolgoztam: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       �j kulcsok kihagyva: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    felh. azonos�t� n�lk�l: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "                import�lva: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "               v�ltozatlan: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       �j felh. azonos�t�k: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              �j alkulcsok: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              �j al��r�sok: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "     �j kulcsvisszavon�sok: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  import�lt titkos kulcsok: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "v�ltozatlan titkos kulcsok: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             nem import�lt: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "              �j al��r�sok: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "%08lX kulcs: HKP alkulcss�r�l�s kijav�tva.\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "%08lX kulcs: Nem �nal��rt felh. azonos�t� (\"%s\") elfogadva.\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "%08lX kulcs: Nincs �rv�nyes felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "%08lX kulcs: Nyilv�nos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "%08lX kulcs: Nem egyezik a mi m�solatunkkal!\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tal�lom az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "%08lX kulcs: Titkos kulcs �rv�nytelen (%d) rejtjelez�vel - kihagytam.\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "%08lX kulcs: M�r szerepel a titkoskulcs-karik�n.\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%08lX kulcs: Titkos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "%08lX kulcs: Nincs nyilv�nos kulcs - nem tudok visszavonni.\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - visszautas�tva.\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t� ehhez az al��r�shoz!\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� alg. a \"%s\" felh. "
 "azonos�t�n!\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "%08lX kulcs: �rv�nytelen �nal��r�s a \"%s\" felh. azonos�t�n!\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsk�t�shez!\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� algoritmus!\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsk�t�st.\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsvisszavon�st.\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "%08lX kulcs: Nem export�lhat� al��r�s (%02x. oszt�ly) - kihagytam.\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "%08lX kulcs: Visszavon� igazol�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - kihagytam.\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "%08lX kulcs: Dupl�zott felh. azonos�t�t tal�ltam - �sszef�ztem.\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "leh�vom a %08lX visszavon� kulcsot.\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "visszavon� kulcs (%08lX) nincs jelen.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "\"%s\" kulcskarik�t l�trehoztam.\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[visszavon�s]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[�nal��r�s]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 rossz al��r�s.\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d rossz al��r�s.\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 al��r�st nem ellen�riztem hiba miatt.\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d al��r�st nem ellen�riztem hiba miatt.\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2763,63 +2768,63 @@ msgstr ""
 "k�l�nb�z� forr�sb�l sz�rmaz� digit�lis ujjlenyomatokkal...)!\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = r�szlegesen megb�zom benne\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = teljesen megb�zom benne\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Biztos abban, hogy tov�bbra is al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  Nem tudom al��rni.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "\"%s\" felhaszn�l�i azonos�t� lej�rt."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2828,11 +2833,11 @@ msgstr ""
 "\"%s\" �nal��r�sa\n"
 "PGP 2.x st�lus�.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Szeretn� �talak�tani OpenPGP �nal��r�ss�? (i/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2841,11 +2846,11 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson lej�rt.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Szeretne kiadni egy �j al��r�st, amellyel lecser�li a lej�rtat? (i/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2854,54 +2859,54 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson helyi al��r�s.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Szeretn� �talak�tani teljes, export�lhat� al��r�ss�? (i/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" m�r al� lett �rva helyileg a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" m�r al� lett �rva a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "M�g egyszer al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Ez a kulcs lej�rt!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Ez a kulcs lej�r: %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Szeretn�, ha az al��r�sa ugyanekkor j�rna le? (I/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Lehet, hogy nem rakhat OpenPGP al��r�st egy PGP 2.x kulcsra --pgp2 m�dban.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Ez haszn�lhatatlann� tenn� a kulcsot PGP 2.x-ben.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2910,32 +2915,32 @@ msgstr ""
 "Mennyire gondosan ellen�rizte, hogy a kulcs, melyet al��rni k�sz�l, val�ban\n"
 "a fent nevezett szem�lyhez tartozik? Ha nem tudja a v�laszt, �rjon \"0\"-t!\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nem v�laszolok.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Egy�ltal�n nem ellen�riztem.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) A szok�sos ellen�rz�seket v�geztem.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Nagyon alaposan ellen�riztem.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Mi a v�lasza? (Adjon meg \"?\"-et magyar�zathoz!): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2944,100 +2949,100 @@ msgstr ""
 "Teljesen biztos abban, hogy al� akarja �rni ezt a kulcsot\n"
 "az �n kulcs�val: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ez egy �nal��r�s lesz.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "FIGYELEM: Az al��r�s nem lesz \"nem export�lhat�k�nt\" megjel�lve.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "FIGYELEM: Az al��r�s nem lesz \"nem visszavonhat�k�nt\" megjel�lve.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Az al��r�st \"nem export�lhat�nak\" jel�lj�k.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Egy�ltal�n nem ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "A szok�sos m�don ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Nagyon gondosan ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Ez a kulcs nem v�dett.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "A kulcs v�dett.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nem tudom szerkeszteni ezt a kulcsot: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3045,11 +3050,11 @@ msgstr ""
 "�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3057,206 +3062,206 @@ msgstr ""
 "�n nem akar jelsz�t. Ez val�sz�n�leg *rossz* �tlet!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Val�ban ezt akarja? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "ment�s �s kil�p�s"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "al��r�sok visszavon�sa"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "kulcs helyi al��r�sa"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "fot�azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "felhaszn�l�i azonos�t� t�rl�se"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "m�sodlagos kulcs t�rl�se"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "visszavon� kulcs hozz�ad�sa"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "v�lt�s a titkos �s a nyilv�nos kulcs list�z�sa k�z�tt"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "preferenci�k list�z�sa (szak�rt�)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "preferenci�k list�z�sa (r�szletes)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "felhaszn�l�i azonos�t� visszavon�sa"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "m�sodlagos kulcs visszavon�sa"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "enable key"
 msgstr "kulcs enged�lyez�se"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "disable key"
 msgstr "kulcs tilt�sa"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "fot�azonos�t� megmutat�sa"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Hiba \"%s\" titkoskulcs-blokk olvas�sakor: %s.\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Titkos kulcs rendelkez�sre �ll.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Ehhez sz�ks�g van a titkos kulcsra.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "K�rem, haszn�lja el�bb a \"toggle\" parancsot!\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3264,241 +3269,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "A kulcsot visszavont�k."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ismeretlen al��r�soszt�ly"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Legal�bb egy felhaszn�l�azonos�t�t ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem t�r�lheti az utols� felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Val�ban elt�vol�tja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Val�ban t�rli ezt a kulcsot? "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "preferencialista be�ll�t�sa"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Val�ban friss�tsem a preferenci�kat? "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Mentsem a v�ltoztat�sokat? "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kil�pjek ment�s n�lk�l? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "A kulcs nem v�ltozott, nincs sz�ks�g friss�t�sre.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Jellemz�k: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr "Jel�l�s: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nincsenek preferenci�k egy PGP 2.x felhaszn�l�azonos�t�n!\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (�rz�keny)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3506,19 +3511,19 @@ msgstr ""
 "K�rem, vegye figyelembe, hogy az itt l�that� kulcs �rv�nyess�ge nem\n"
 "felt�tlen�l helyes, am�g �jra nem ind�tja a programot!\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3526,7 +3531,7 @@ msgstr ""
 "FIGYELEM: Nincs kijel�lt els�dleges felhaszn�l�azonos�t�. Ez a parancs\n"
 " azt okozhatja, hogy egy m�sik azonos�t� lesz els�dlegesk�nt haszn�lva.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3536,75 +3541,75 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Lehet, hogy nem adhat fot�azonos�t�t egy PGP2 st�lus� kulcshoz!\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "�rv�nytelen p�nc�l"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3614,372 +3619,372 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Lehet, hogy nem adhat kijel�lt visszavon�t egy PGP 2.x-st�lus� kulcshoz.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�rja be a kijel�lt visszavon� felhaszn�l�azonos�t�j�t: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "Nem adhat meg PGP 2.x st�lus� kulcsot kijel�lt visszavon�nak!\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Nem adhat meg egy kulcsot saj�t kijel�lt visszavon�j�nak!\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "FIGYELEM: A kijel�lt visszavon� kulcs megad�sa nem csin�lhat� vissza!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Biztosan ez a kulcs legyen a kijel�lt visszavon�? (i/N): "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "K�rem, t�vol�tsa el a kijel�l�seket a titkos kulcsokr�l!\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "FIGYELEM: %08lX al��r� alkulcs nem kereszthiteles�tett.\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "K�rem, v�lasszon ki pontosan egy felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Kihagyom a v3 �nal��r�st a \"%s\" felhaszn�l�azonos�t�n.\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Al��r�s-jel�l�s: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Fel�l�rjam (i/N)? "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   al��rva %08lX �ltal %s%s%s id�pontban.\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez az al��r�shoz? (i/N) "
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "FIGYELEM: A felhaszn�l�azonos�t�t %d m�sodperccel a j�v�ben �rt�k al�.\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s fot�azonos�t� (m�ret: %ld, kulcs: 0x%08lX, felh: %d) mutat�sa.\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "%c%lu preferencia k�tszer szerepel!\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "T�l sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "Sima al��r�st �rok.\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "�nal��r�st �rok.\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "�sszef�z� al��r�st �rok.\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Kulcsm�ret �rv�nytelen; %u bitet haszn�lok.\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 #, fuzzy
 msgid "Encrypt"
 msgstr "adat titkos�t�sa"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "A DSA kulcsp�r 1024 bites lesz.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Milyen kulcsm�retet szeretne? (1024) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "A k�v�nt kulcsm�ret %u bit.\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "Felkerek�tve %u bitre.\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3995,7 +4000,7 @@ msgstr ""
 "      <n>m = a kulcs n h�napig �rv�nyes\n"
 "      <n>y = a kulcs n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4011,40 +4016,40 @@ msgstr ""
 "      <n>m = az al��r�s n h�napig �rv�nyes\n"
 "      <n>y = az al��r�s n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "Meddig �rv�nyes a kulcs? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Meddig �rv�nyes az al��r�s? (0) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "�rv�nytelen �rt�k!\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s lej�r: %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4052,12 +4057,12 @@ msgstr ""
 "Az �n rendszere nem tud megjelen�teni 2038 ut�ni d�tumokat.\n"
 "Azonban kezelni helyesen tudja �ket eg�szen 2106-ig.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ez �gy helyes (i/n)? "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 #, fuzzy
 msgid ""
 "\n"
@@ -4074,44 +4079,44 @@ msgstr ""
 "    \"Heinrich Heine (a k�lt�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Teljes n�v: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "E-mail c�m: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Ez nem �rv�nyes e-mail c�m.\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Megjegyz�s: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�n a(z) %s karakterk�dol�st haszn�lja.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4122,7 +4127,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
 
@@ -4137,24 +4142,24 @@ msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (K)il�p�s? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (R)endben/(K)il�p�s? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4162,12 +4167,12 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4179,7 +4184,7 @@ msgstr ""
 "az \"--edit-key\" opci�val.\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4191,50 +4196,50 @@ msgstr ""
 "a lemezeket) a pr�msz�m gener�l�sa alatt. Ez seg�ti a v�letlensz�m-\n"
 "gener�tort, hogy entr�pi�t tudjon gy�jteni.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�rom a kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" nyilv�noskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "A nyilv�nos �s titkos kulcsokat l�trehoztam �s al��rtam.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4244,724 +4249,724 @@ msgstr ""
 "k�v�n ilyen c�lra l�trehozni, azt az \"--edit-key\" parancs seg�ts�g�vel\n"
 "teheti meg.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "MEGJEGYZ�S: Alkulcsok l�trehoz�sa v3 kulcsokhoz nem OpenPGP-megfelel�.\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Val�ban l�trehozzam? "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "soha      "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Kritikus al��r�si elj�r�sm�d: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Al��r�si elj�r�sm�d: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Kritikus al��r�s-jel�l�s: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Al��r�s-jel�l�s: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Kulcskarika"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr " Kulcs ujjlenyomata ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "FIGYELEM: 2 bizalmas inform�ci�kat tartalmaz� �llom�ny van!\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s az eredeti p�ld�ny.\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s az �j p�ld�ny.\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "K�rem, oldja meg ezt a lehets�ges biztons�gi probl�m�t!\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "Ellen�rz�m a(z) \"%s\" kulcskarik�t.\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Kulcskarik�t l�trehoztam.\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "FIGYELEM: \"%s\" opci�i csak a k�vetkez� fut�skor lesznek �rv�nyesek!\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "Al��rva az �n %08lX kulcs�val %s id�pontban.\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 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:239
+#: g10/mainproc.c:243
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Furcsa m�ret� (%d) titkos�tott munkafolyamatkulcs.\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s titkos�tott munkafolyamatkulcs\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Nyilv�nos kulcs: %08lX\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "Nyilv�nos kulccsal titkos�tott adat: j� DEK.\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Titkos�tva %s kulccsal, azonos�t�: %08lX\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Nyilv�nos kulcs� visszafejt�s sikertelen: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s titkos�tott adatot felt�telezek.\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "Visszafejt�s rendben.\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "FIGYELEM: Az �zenetet nem l�tt�k el integrit�sv�delemmel.\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "FIGYELEM: A titkos�tott �zenetet manipul�lt�k!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 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:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Eredeti f�jln�v: '%.*s'.\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 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:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, 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:1550
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Al��rva: %.*s; kulcs: %s, %08lX.\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[bizonytalan]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "Bin�ris"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "Sz�vegm�d�"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "Ismeretlen m�d�"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "Nem k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 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:2045
+#: g10/mainproc.c:2049
 #, 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:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�rv�nytelen gy�k�rcsomagot tal�ltam a proc_tree() f�ggv�nyben!\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "Nem tudom letiltani a core f�jlokat: %s.\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "nem megval�s�tott rejtjelez� algoritmus"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "Az IDEA rejtjelez� b�v�t�s nincs jelen!\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = tov�bbi inform�ci�kat k�rek\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: Elavult opci�: \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "K�rem, ezt haszn�lja helyette: \"%s%s\"\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Lehet, hogy ez az �zenet haszn�lhatatlan a %s sz�m�ra!\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "\"%s\" �llom�ny l�tezik. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Fel�l�rjam (i/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ismeretlen v�gz�d�s.\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "�rja be az �j �llom�nynevet"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "�rok a szabv�nyos kimenetre.\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, 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:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "\"%s\" �j konfigur�ci�s �llom�nyt l�trehoztam.\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "FIGYELEM: \"%s\" opci�i csak a k�vetkez� fut�skor lesznek �rv�nyesek!\n"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: K�nyvt�rat l�trehoztam.\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztons�gos!\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "Probl�ma van az �gyn�kkel. Letiltom a haszn�lat�t.\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr ""
 " \n"
 "  (f� kulcsazonos�t�: %08lX)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4973,28 +4978,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u bites %s key, azonos�t�: %08lX, l�trehozva: %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Ism�telje meg a jelsz�t!\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "�rja be a jelsz�t!\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "Nem tudok jelsz�t bek�rni k�tegelt m�dban!\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "�rja be a jelsz�t: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5005,21 +5010,21 @@ msgstr ""
 "haszn�lat�hoz:\n"
 "\""
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bites %s kulcs, azonos�t�: %08lX, l�trehozva: %s."
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Ism�telje meg a jelsz�t: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5033,164 +5038,164 @@ msgstr ""
 "k�pet haszn�l, a kulcsa is nagyon nagy lesz!\n"
 "A 240x288 k�r�li k�pm�ret j�l haszn�lhat�.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Adja meg egy JPEG f�jl nev�t a fot�azonos�t�hoz: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" nem JPEG �llom�ny.\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Ez a fot� megfelel� (i/N/k)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "Nem tudom megjelen�teni a fot�azonos�t�t!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "Nincs megadva ok."
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "A kulcsot lecser�lt�k."
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "A kulcs kompromitt�l�dott."
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "A kulcs m�r nem haszn�latos."
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "A felhaszn�l�i azonos�t� m�r nem �rv�nyes."
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "Visszavon�s oka: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "Megjegyz�s a visszavon�shoz: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iIfFkKhH"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nincs megb�zhat�s�gi �rt�k rendelve:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Ez a kulcs val�sz�n�leg a jelzett tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Nem tudom\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NEM b�zom benne\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = alapvet�en megb�zom benne\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " f = visszat�r�s a f�men�be\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " h = kulcs kihagy�sa\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " k = kil�p�s\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Mit v�laszt? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "T�nyleg be akarja �ll�tani ezt a kulcsot alapvet�en megb�zhat�ra? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Alapvet�en megb�zhat� kulcshoz vezet� igazol�sok:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Ez a kulcs val�sz�n�leg a jelzett tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Ez a kulcs hozz�nk tartozik.\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5202,110 +5207,110 @@ msgstr ""
 "a k�vetkez� k�rd�sre v�laszolhat igennel.\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "M�gis haszn�ljuk ezt a kulcsot? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "FIGYELEM: Nem b�zunk a kulcsban, amit haszn�lunk!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "FIGYELEM: a kulcsot visszavonhatt�k (visszavon� kulcs nincs jelen).\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "FIGYELEM: Ezt a kulcsot a tulajdonosa visszavonta!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Ez jelentheti azt, hogy az al��r�s hamis.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "FIGYELEM: Ezt az alkulcsot a tulajdonosa visszavonta!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Megjegyz�s: Ez a kulcs le lett tiltva.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Megjegyz�s: Ez a kulcs lej�rt!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "FIGYELEM: Ez a kulcs nincs hiteles�tve megb�zhat� al��r�ssal!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "          Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "FIGYELEM: NEM b�zunk ebben a kulcsban!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Az al��r�s val�sz�n�leg HAMIS.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "FIGYELEM: Ez a kulcs nincs igazolva kell�k�ppen megb�zhat� al��r�ssal!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nem biztos, hogy az al��r�s a tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: kihagyva: nyilv�nos kulcs m�r szerepel\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Nem adott meg felhaszn�l�i azonos�t�t! (Haszn�lhatja a \"-r\" opci�t.)\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5313,170 +5318,170 @@ msgstr ""
 "\n"
 "Adja meg a felhaszn�l�i azonos�t�t! �res sorral fejezze be: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Nincs ilyen felhaszn�l�i azonos�t�.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva alap�rtelmezett c�mzettnek.\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "Nyilv�nos kulcs nincs enged�lyezve.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva.\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: Kihagyva: Nyilv�nos kulcs nincs enged�lyezve.\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "Nincsenek �rv�nyes c�mzettek!\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Az adatot nem mentettem el. Haszn�lja az \"--output\" opci�t a ment�shez!\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "K�l�n�ll� al��r�s.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "K�rem, adja meg az adat�llom�ny nev�t: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "Olvasom a szabv�nyos bemenetet...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "Nincs al��rt adat.\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "Anonim c�mzett. A %08lX titkos kulcsot pr�b�lom...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Rendben, mi vagyunk az anonim c�mzett.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "A DEK r�gi k�dol�sa nem t�mogatott.\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "A %d%s rejtjelez� algoritmus ismeretlen vagy tiltott.\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "MEGJEGYZ�S: %d rejtjelez� algoritmus nincs a preferenci�k k�z�tt.\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet sikertelen: %s.\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Visszavonja:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Ez egy �rz�keny visszavon� kulcs.)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-p�nc�lozott kimenet kiv�lasztva.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet sikertelen: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Visszavon� igazol�s l�trehozva.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "Nem tal�ltam visszavon� kulcsot a k�vetkez�h�z: \"%s\".\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "MEGJEGYZ�S: Ez a kulcs nem v�dett.\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5494,180 +5499,163 @@ msgstr ""
 "adathordoz� olvashatatlann� v�lik. De vigy�zat: az �n g�p�nek nyomtat�si\n"
 "rendszere is t�rolhatja az adatot, �s m�sok esetleg hozz�f�rhetnek ehhez!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "M�gsem"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Val�sz�n�leg a(z) %d. lehet�s�get akarja v�lasztani.)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Adjon meg egy nem k�telez� le�r�st! �res sorral fejezze be:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Visszavon�s oka: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(Nincs le�r�s.)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ez �gy rendben van? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "�rv�nytelen jelsz�. Pr�b�lja �jra"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "FIGYELEM: Gyenge kulcsot tal�ltam. K�rem, v�ltoztassa meg ism�t a jelsz�t!\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "Elavult, 16 bites ellen�rz��sszeget hozok l�tre titkos kulcs v�delm�hez.\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "Gyenge kulcs j�tt l�tre. �jrapr�b�lom.\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "Nem tudom elker�lni a gyenge kulcsot a szimmetrikus titkos�t�hoz.\n"
 "%d alkalommal pr�b�ltam!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "FIGYELEM: Al��r�skivonat-konfliktus az �zenetben.\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "FIGYELEM: %08lX al��r� alkulcs nem kereszthiteles�tett.\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "FIGYELEM: %08lX al��r� alkulcson �rv�nytelen kereszthiteles�t�s van.\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "MEGJEGYZ�S: Al��r� kulcs (%08lX) lej�rt: %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "Rossz al��r�st felt�telezek a %08lX kulcst�l egy ismeretlen\n"
 "kritikus bit miatt.\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "%08lX kulcs: Nincs alkulcs az alkulcsvisszavon� csomaghoz.\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "%08lX kulcs: Nincs alkulcs az alkulcsk�t� al��r�shoz!\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "Nem tehet jel�l�adatot a v3-as (PGP 2.x st�lus�) al��r�sokba!\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "Nem tehet jel�l�adatot a v3-as (PGP 2.x st�lus�) kulcsal��r�sokba!\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "FIGYELEM: Nem tudom kifejteni a %% jeleket a jel�l�sben (t�l hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "Nem tehet elj�r�sm�d-URL-t a v3-as (PGP 2.x st�lus�) al��r�sokba!\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"Nem tehet elj�r�sm�d-URL-t a v3-as (PGP 2.x st�lus�) kulcsal��r�sokba!\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5676,7 +5664,7 @@ msgstr ""
 "hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5686,22 +5674,22 @@ msgstr ""
 "hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s al��r�s a k�vetkez�t�l: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "K�l�n�ll� al��r�st PGP 2.x st�lus� kulcsokkal csak --pgp2 m�dban k�sz�thet!\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5709,53 +5697,53 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "Al��rom:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Olvashat� sz�veget PGP 2.x st�lus� kulccsal csak --pgp2 m�dban �rhat al�!\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s titkos�t�st fogok haszn�lni.\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "A kulcs nincs \"nem biztons�gosnak\" jel�lve,\n"
 "nem tudom a p�tl� v�letlensz�m-gener�torral haszn�lni!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\"-t kihagytam: m�sodp�ld�ny.\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "Kihagytam \"%s\"-t: %s.\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "Kihagytam \"%s\"-t: ez egy PGP �ltal l�trehozott ElGamal kulcs, amely nem\n"
 "biztons�gos al��r�sokhoz!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5764,348 +5752,348 @@ msgstr ""
 "# Meghat�rozott bizalmi �rt�kek list�ja, %s.\n"
 "# (Haszn�lja a \"gpg --import-ownertrust\" parancsot a vissza�ll�t�shoz!)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "A sor t�l hossz�!\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "bizalmi �rt�kek importja"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "Hiba bizalmi rekord keres�sekor: %s.\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "Olvas�si hiba: %s.\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "Bizalmi adatb�zis: szinkroniz�ci� sikertelen: %s.\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "Bizalmi adatb�zis %lu. rekord: lseek sikertelen: %s.\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "Bizalmi adatb�zis %lu. rekord: �r�s sikertelen (n=%d): %s.\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "Bizalmi adatb�zis tranzakci�ja t�l nagy.\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: K�nyvt�r nem l�tezik!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Nem siker�lt verzi�rekordot l�trehoznom: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: �rv�nytelen bizalmi adatb�zis j�tt l�tre.\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: Bizalmi adatb�zis l�trej�tt.\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "MEGJEGYZ�S: Bizalmi adatb�zis nem �rhat�.\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: �rv�nytelen bizalmi adatb�zis.\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord friss�t�sekor: %s.\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord olvas�sakor: %s.\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Hiba a verzi�rekord �r�sakor: %s.\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "Bizalmi adatb�zis: lseek sikertelen: %s.\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: Nem bizalmi adatb�zis.\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: Verzi�rekord, rekordsz�m: %lu.\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: �rv�nytelen �llom�nyverzi� (%d).\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Hiba k�nyvt�rrekord �r�sakor: %s.\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: Nem siker�lt egy rekord null�z�sa: %s.\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: Nem siker�lt egy rekord hozz�ad�sa: %s.\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Bizalmi adatb�zis s�r�lt. K�rem, futtassa: \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "Nem tudok %d karaktern�l hosszabb sz�vegsorokat kezelni!\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "A bemeneti sor hosszabb, mint %d karakter.\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "\"%s\" nem egy �rv�nyes hossz� kulcsazonos�t�.\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "%08lX kulcs: Elfogadva megb�zhat� kulcsk�nt.\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "A(z) %08lX kulcs egyn�l t�bbsz�r szerepel a bizalmi adatb�zisban.\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "%08lX kulcs: Nincs nyilv�nos kulcs a megb�zhat� kulcshoz - kihagytam.\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "A kulcsot alapvet�en megb�zhat�nak jel�ltem.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "%lu bizalmi rekord, %d k�r�st�pus: olvas�s sikertelen: %s.\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "%lu bizalmi rekord nem a k�rt t�pus� (%d).\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[visszavont] "
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[lej�rt]     "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "Ismeretlen m�d�"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "soha      "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "A bizalmi adatb�zis k�vetkez� ellen�rz�se: %s.\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "A(z) %08lX nyilv�nos kulcsot nem tal�lom: %s.\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "K�rem, hajtson v�gre egy --check-trustdb parancsot!\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "Ellen�rz�m a bizalmi adatb�zist.\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kulcsot feldolgoztam (%d �rv�nyess�gsz�ml�l�t t�r�ltem)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "Nem tal�ltam alapvet�en megb�zhat� kulcsot.\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Nem tal�lom az alapvet�en megb�zhat� %08lX kulcs nyilv�nos kulcs�t!\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 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:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6120,309 +6108,323 @@ msgstr ""
 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"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "�ltal�nos hiba"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "ismeretlen csomagt�pus"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "ismeretlen verzi�"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "ismeretlen nyilv�nos kulcs� algoritmus"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "ismeretlen kivonatol� algoritmus"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "rossz nyilv�nos kulcs"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "rossz titkos kulcs"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "rossz al��r�s"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "hib�s ellen�rz��sszeg"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "rossz jelsz�"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "nyilv�nos kulcs nem tal�lhat�"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "ismeretlen rejtjelez� algoritmus"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "nem lehet megnyitni a kulcskarik�t"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "�rv�nytelen csomag"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "�rv�nytelen p�nc�l"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "nincs ilyen felhaszn�l�i azonos�t�"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "titkos kulcs nem �ll rendelkez�sre"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "rossz titkos kulcs haszn�lata"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "nem t�mogatott"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "rossz kulcs"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "�llom�nyolvas�si hiba"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "�llom�ny�r�si hiba"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "ismeretlen t�m�r�t� algoritmus"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "�llom�nymegnyit�si hiba"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "�llom�nyl�trehoz�si hiba"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "�rv�nytelen jelsz�"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "nem megval�s�tott nyilv�nos kulcs� algoritmus"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "nem megval�s�tott rejtjelez� algoritmus"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "ismeretlen al��r�soszt�ly"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "hib�s bizalmi adatb�zis"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "hib�s MPI"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "er�forr�shat�r"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "�rv�nytelen kulcskarika"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "rossz igazol�s"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "rossz form�j� felhaszn�l�i azonos�t�"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "�llom�nyz�r�si hiba"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "�llom�ny�tnevez�si hiba"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "�llom�nyt�rl�si hiba"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "nem v�rt adat"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "id�b�lyeg-konfliktus"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "haszn�lhatatlan nyilv�nos kulcs� algoritmus"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "�llom�ny l�tezik"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "gyenge kulcs"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "�rv�nytelen argumentum"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "rossz URI"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "nem t�mogatott URI"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "h�l�zati hiba"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "nem titkos�tott"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "nem feldolgozott"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "haszn�lhatatlan nyilv�nos kulcs"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "haszn�lhatatlan titkos kulcs"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "kulcsszerverhiba"
 
-#: util/errors.c:109
+#: util/errors.c:107
 #, fuzzy
 msgid "canceled"
 msgstr "M�gsem"
 
-#: util/errors.c:110
+#: util/errors.c:108
 #, fuzzy
 msgid "no card"
 msgstr "nem titkos�tott"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "Nincs al��rt adat.\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "Ez egy programhiba... (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Tal�lt egy programhib�t... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "igen"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "iI"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "nem"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "kil�p�s|kilepes"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "kK"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "FIGYELEM: Nem biztons�gos mem�ri�t haszn�lunk!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "Tov�bbi inform�ci� a http://www.gnupg.org/faq.html c�men tal�lhat�.\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "A m�velet nem lehets�ges biztons�gos mem�ria n�lk�l.\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "Nem tehet jel�l�adatot a v3-as (PGP 2.x st�lus�) al��r�sokba!\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "Nem tehet jel�l�adatot a v3-as (PGP 2.x st�lus�) kulcsal��r�sokba!\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "Nem tehet elj�r�sm�d-URL-t a v3-as (PGP 2.x st�lus�) al��r�sokba!\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "Nem tehet elj�r�sm�d-URL-t a v3-as (PGP 2.x st�lus�) kulcsal��r�sokba!\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "A DSA 160 bites hash (kivonatol�) algoritmust ig�nyel.\n"
 
diff --git a/po/id.po b/po/id.po
index 2de6da451..749292ad6 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -16,90 +16,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "tidak dapat membuat bilangan prima dengan bit kurang dari %d\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "tidak dapat membuat bilangan prima dengan bit kurang dari %d\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "modul entropi gathering tidak terdeteksi\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "tidak dapat melakukan statistik `%s': %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' bukan file reguler - diabaikan\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "catatan: file random_seed kosong\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "tidak dapat membaca `%s': %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "catatan: file random_seed tidak diupdate\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "tidak dapat menulis `%s': %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -113,7 +113,7 @@ msgstr ""
 "JANGAN MENGGUNAKAN DATA YANG DIHASILKAN PROGRAM INI!!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -123,7 +123,7 @@ msgstr ""
 "bila itu tidak akan membosankan anda, karena hal tersebut akan memperbaiki\n"
 "kualitas entropi.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -134,62 +134,62 @@ msgstr ""
 "Tidak tersedia cukup byte random. Silakan melakukan aktivitas lain agar\n"
 "memungkinkan SO mengumpulkan lebih banyak entropi! (Perlu %d byte lagi)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -197,364 +197,369 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 #, fuzzy
 msgid "generating new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "header armor tidak valid: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "header armor: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "header clearsig tidak valid\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "header armor: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "signature teks bersarang\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armor tidak terduga:"
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "dash escaped line tidak valid: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (tanpa CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (dalam CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "CRC tidak tepat\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "kesalahan CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematur (dalam Trailer)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "karakter yang dapat dicetak dalam armor - mungkin telah digunakan MTA yang "
 "mengandung bug\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "kunci rahasia tidak tersedia"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "unspecified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 #, fuzzy
 msgid "not forced"
 msgstr "tidak diproses"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 #, fuzzy
 msgid "Language preferences: "
 msgstr "perbarui preferensi"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -562,468 +567,468 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "kunci rahasia tidak tersedia"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ulangi passphrase: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(kecuali anda menspesifikasikan kunci dengan fingerprint)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "tidak dapat dilakukan dalam mode batch tanpa \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Menghapus kunci ini dari keyring? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Ini adalah kunci rahasia! - Yakin dihapus? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "informasi ownertrust dihapus\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "tidak dapat menggunakan paket simetri ESK karena mode S2K\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "menggunakan cipher %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat mengenkripsi ke kunci RSA 2048 bit atau kurang dalam mode --"
 "pgp2\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "tidak dapat menggunakan cipher IDEA untuk semua kunci yang anda enkripsi.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "masalah menangani paket terenkripsi\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "tidak ada eksekusi program remote yang didukung\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "pemanggilan program eksternal ditiadakan karena permisi opsi file tidak "
 "aman\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "platform ini membutuhkan file temp ketika memanggil program eksternal\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "kesalahan sistem ketika memanggil program eksternal: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "program eksternal berhenti secara tidak natual\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "tidak dapat mengeksekusi program eksternal\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "tidak dapat membaca tanggapan program eksternal: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus direktori temp `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "batalkan kunci sekunder"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "kunci rahasia tidak dapat dipakai"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "PERINGATAN: kunci rahasia %08lX tidak memiliki sebuah checksum SK sederhana\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1031,128 +1036,128 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1162,51 +1167,51 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "detil"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1214,7 +1219,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1234,15 +1239,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1252,7 +1257,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1260,650 +1265,650 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat membuat signature detached atau clear saat dalam mode --"
 "pgp2\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
 "pgp2\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
 "pgpg2\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "mengambil kunci ini dari keyring"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "buat timestamp konflik hanya sebagai peringatan"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1911,7 +1916,7 @@ msgstr ""
 "Sintaks: gpg [options] [files]\n"
 "Periksa signature terhadap kunci terpercaya\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1923,7 +1928,7 @@ msgstr ""
 "ada\n"
 "kaitan dengan (membuat secara implisit) web-of-certificates."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1935,16 +1940,16 @@ msgstr ""
 "akses ke kunci rahasia.  Jawab \"yes\" untuk menset kunci ini ke\n"
 "sangat dipercaya\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Jika anda ingin menggunakan kunci tidak terpercaya ini, jawab \"ya\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Masukkan ID user penerima pesan."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1958,7 +1963,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1969,16 +1974,16 @@ msgstr ""
 "mengenkripsi.  Algoritma ini seharusnya digunakan dalam domain tertentu.\n"
 "Silakan berkonsultasi dulu dengan ahli keamanan anda."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Masukkan ukuran kunci"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Jawab \"ya\" atau \"tidak\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1990,19 +1995,19 @@ msgstr ""
 "tidak akan mendapat respon kesalahan yang baik - sebaiknya sistem akan\n"
 "berusaha menginterprestasi nilai yang diberikan sebagai sebuah interval."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Masukkan nama pemegang kunci"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "silakan masukkan alamat email (pilihan namun sangat dianjurkan)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Silakan masukkan komentar tambahan"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2016,11 +2021,11 @@ msgstr ""
 "O  untuk melanjutkan dengan pembuatan kunci.\n"
 "K  untuk menghentikan pembuatan kunci."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Jawab \"ya\" (atau \"y\") jika telah siap membuat subkey."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2098,12 +2103,12 @@ msgstr ""
 "\n"
 "Jika anda tidak tahu jawaban yang tepat, jawab \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Jawab \"ya\" jika anda ingin menandai seluruh ID user"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2111,11 +2116,11 @@ msgstr ""
 "Jawab \"ya\" jika anda benar-benar ingin menghapus ID user ini.\n"
 "Seluruh sertifikat juga akan hilang!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Jawab \"ya\" jika ingin menghapus subkey"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2125,7 +2130,7 @@ msgstr ""
 "signature ini karena mungkin penting membangun koneksi trust ke kunci atau\n"
 "ke kunci tersertifikasi lain dengan kunci ini."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2137,7 +2142,7 @@ msgstr ""
 "kunci yang digunakan karena kunci penanda ini mungkin membangun suatu\n"
 "koneksi trust melalui kunci yang telah tersertifikasi lain."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2145,7 +2150,7 @@ msgstr ""
 "Signature tidak valid.  Adalah hal yang masuk akal untuk menghapusnya dari\n"
 "keyring anda"
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2159,7 +2164,7 @@ msgstr ""
 "ini bila self-signature untuk beberapa alasan tidak valid dan\n"
 "tersedia yang kedua."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2169,24 +2174,24 @@ msgstr ""
 "ke daftar preferensi saat ini.  Timestamp seluruh self-signature\n"
 "yang terpengaruh akan bertambah satu detik.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Silakan ulangi passphrase terakhir, sehingga anda yakin yang anda ketikkan."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Beri nama file tempat berlakunya signature"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Jawab \"ya\" jika tidak apa-apa menimpa file"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2194,7 +2199,7 @@ msgstr ""
 "Silakan masukan nama file baru. Jika anda hanya menekan RETURN nama\n"
 "file baku (yang diapit tanda kurung) akan dipakai."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2224,7 +2229,7 @@ msgstr ""
 "      normalnya digunakan untuk menandai bahwa alamat email tidak valid "
 "lagi.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2234,535 +2239,535 @@ msgstr ""
 "mengeluarkan sertifikat pembatalan ini. Buatlah ringkas.\n"
 "Baris kosong mengakhiri teks.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Tidak tersedia bantuan"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "perbarui database trust"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "kunci rahasia tidak dapat dipakai"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kunci telah diproses\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        lewati kunci baru: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "             diimpor: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "            tidak berubah: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         ID user baru: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tidak berubah: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            tidak diimpor: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kunci %08lX: \"%s\" tidak berubah\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
 "pembatalan\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kunci %08lX: hapus subkey binding ganda\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2775,63 +2780,63 @@ msgstr ""
 "memeriksa fingerprint dari berbagai sumber...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Saya cukup percaya\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Saya sangat percaya\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" kadaluwarsa."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2840,11 +2845,11 @@ msgstr ""
 "Self-signature pada \"%s\"\n"
 "adalah signature bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Anda ingin mempromosikannya ke self-signature OpenPGP ? (y/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2853,13 +2858,13 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "telah habis berlaku.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis "
 "berlaku? (y/N)"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2868,43 +2873,43 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "adalah signature.lokal \n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai secara lokal dengan kunci %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Apakah anda ingin menandainya lagi? (y/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2912,11 +2917,11 @@ msgstr ""
 "Anda tidak boleh membuat signature OpenPGP pada sebuah kunci PGP 2.x saat "
 "dalam mode --pgp2\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Hal ini akan membuat kunci tidak dapat digunakan dalam PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2926,32 +2931,32 @@ msgstr ""
 "menandai benar benar milik\n"
 "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Saya tidak akan menjawab.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Saya belum memeriksanya.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2960,100 +2965,100 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ini akan jadi self-signature.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Saya belum memeriksa kunci ini sama sekali.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3061,11 +3066,11 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3073,206 +3078,206 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "tambah kunci pembatalan"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "batalkan sebuah ID user"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "enable key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "disable key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "tampilkan photo ID"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3280,241 +3285,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan"
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Benar-benar hapus ID user ini? "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr "Notasi: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3522,19 +3527,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3542,7 +3547,7 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3552,75 +3557,75 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3630,375 +3635,375 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
 "sendiri\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat "
 "dilakukan\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "melewati self-signature v3 pada user id \"%s\"\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "menulis signature direct\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 #, fuzzy
 msgid "Sign"
 msgstr "tandai"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 #, fuzzy
 msgid "Encrypt"
 msgstr "enkripsi data"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4014,7 +4019,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4030,40 +4035,40 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4071,12 +4076,12 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 #, fuzzy
 msgid ""
 "\n"
@@ -4092,44 +4097,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4139,7 +4144,7 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 
@@ -4154,23 +4159,23 @@ msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4178,12 +4183,12 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4196,7 +4201,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4208,50 +4213,50 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4261,711 +4266,711 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "tidak pernah..."
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Kebijakan signature kritis: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Kebijakan signature: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Notasi signature kritis: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Notasi signature: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint kunci primer:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr "     Fingerprint kunci primer ="
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Fingerprint kunci ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s adalah yang tidak berubah\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s adalah yang baru\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Silakan perbaiki kemungkinan lubang keamanan ini\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "memeriksa keyring `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kunci sesi enkripsi\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "dienkripsi dengan passphrase %lu\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "dienkripsi dengan 1 passphrase\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "Kunci tersedia di:"
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "biner"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "tidak dikenal"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 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:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "tidak dapat meniadakan core dump: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritma cipher belum diimplementasikan"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin cipher IDEA tidak tersedia\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = beri saya informasi lebih banyak lagi\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "silakan gunakan \"%s%s\"\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "File `%s' ada. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffix tidak dikenal\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Masukkan nama file baru"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "menulis ke stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "mengasumsikan data bertanda dalam `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "file konfigurasi baru `%s' tercipta\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, 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"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "masalah dengan agen - tiadakan penggunaan agen\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID kunci utama %08lX)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4976,28 +4981,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Ulangi passphrase\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Masukkan passphrase\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "tidak dapat meminta password dalam mode batch\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Masukkan passphrase: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5007,21 +5012,21 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5037,164 +5042,164 @@ msgstr ""
 "gambar yang sangat besar, kunci anda akan menjadi semakin besar pula!\n"
 "Jagalah agar gambar mendekati ukuran 240x288.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Masukkan nama file JPEG sebagai ID foto: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" bukan sebuah file JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Apakah foto ini benar (y/N/q)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "tidak dapat menampilkan photo ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "Kunci dilampaui"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "Kunci ini telah dikompromikan"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "Kunci tidak lagi digunakan"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "ID User tidak lagi valid"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "Alasan pembatalan:"
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "Komentar pembatalan:"
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Tidak ada nilai trust untuk:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Kunci ini mungkin milik pemiliknya\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Tidak tahu\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d: Saya TIDAK percaya\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Saya sangat percaya sekali\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = kembali ke menu utama\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = lewati kunci ini\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = berhenti\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Keputusan anda? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Anda ingin menset kunci ini menjadi sangat percaya sekali?"
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Sertifikat mengarahkan ke kunci terpercaya:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Kunci ini mungkin milik pemiliknya\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Kunci ini milik kita\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5206,110 +5211,110 @@ msgstr ""
 "pertanyaan berikut dengan ya\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Tetap gunakan kunci ini? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "PERINGATAN: Menggunakan kunci tidak dipercaya!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "Peringatan: kunci ini mungkin dibatalkan:(kunci pembatalan tidak ada)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "        Hal ini dapat berarti bahwa signature adalah palsu.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "PERINGATAN: Subkey ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Catatan: Kunci ini telah ditiadakan\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Catatan: Kunci ini telah berakhir!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "  Tidak ada indikasi signature milik pemilik.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "PERINGATAN: Kita tidak percaya kunci ini!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "        Signature mungkin palsu.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "        Tidak pasti signature milik pemilik.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Anda tidak menspesifikasikan ID user. (anda dapat gunakan \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5317,168 +5322,168 @@ msgstr ""
 "\n"
 "Masukkan user ID.  Akhiri dengan baris kosong: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "Kunci publik dimatikan.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "dilewati: kunci publik telah diset\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Menghapus signature.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Silakan masukkan nama file data: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "membaca stdin ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "tidak ada data tertandai\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "penerima anonim; mencoba kunci rahasia %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "baik, kita adalah penerima anonim.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "encoding lama DEK tidak didukung\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritma cipher %d%s tidak dikenal atau ditiadakan\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet gagal: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Akan dibatalkan oleh:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Ini adalah kunci pembatalan sensitif)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "Pemaksaan output mode ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "gagal make_keysig_packet: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "CATATAN: Kunci ini tidak diproteksi!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5498,181 +5503,163 @@ msgstr ""
 "pencetakan\n"
 "mesin anda mungkin menyimpan data dan menyediakannya untuk yang lain!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "Batal"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Mungkin anda ingin memilih %d di sini)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Masukkan sebuah deskripsi opsional; akhiri dengan sebuah baris kosong:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Alasan pembatalan: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ini oke? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Passphrase tidak valid; silakan coba lagi"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "PERINGATAN: terdeteksi kunci lemah - silakan ubah passphrase lagi.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "membuat checksum 16-bit terdepresiasi untuk proteksi kunci rahasia\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "kunci lemah tercipta - mengulang\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "Peringatan: konflik digest signature dalam pesan\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "PERINGATAN: subkey penanda tangan %08lX memiliki sertifikasi silang yang "
 "tidak valid\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "CATATAN: kunci signature %08lX berakhir %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "mengasumsikan signature buruk dari kunci %08lX karena ada bit kritik tidak "
 "dikenal\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan paket\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding signature\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "tidak dapat menaruh notasi data ke signature v3(gaya PGP 2.x)\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "tidak dapat menaruh notasi data ke kunci signature v3 (gaya PGP 2.x)\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand notasi (terlalu besar).  "
 "Menggunakan yang tidak di-expand.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"tidak dapat menaruh sebuah kebijakan URL ke signature v3 (gaya PGP 2.x)\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"tidak dapat menaruh sebuah kebijakan URL ke signature v3 (gaya PGP 2.x)\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5680,7 +5667,7 @@ msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5689,76 +5676,76 @@ msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signature dari: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat detach-sign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat clearsign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG "
 "palsu!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "lewati `%s': terduplikasi\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "melewati `%s': ini adalah kunci ElGamal yang dihasilkan PGP yang tidak aman "
 "untuk signature!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5767,347 +5754,347 @@ msgstr ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "baris terlalu panjang\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "impor nilai ownertrust"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "kesalahan: gagal menemukan catatan trust: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: gagal sync: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek gagal: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "transaksi trustdb terlalu besar\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: direktori tidak ada!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: gagal membuat catatan versi: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: tercipta trustdb tidak valid\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tercipta trustdb\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "CATATAN: trustdb tidak dapat ditulisi\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb tidak valid\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: kesalahan memperbaharui catatan versi: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: kesalahan membaca catatan versi: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: kesalahan menulis catatan versi: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek gagal: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bukan file trustdb\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: catatan versi dengan recnum %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi file %d tidak valid\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: kesalahan menulis dir record: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: gagal mengosongkan record: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: gagal menambahkan record: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "tidak dapat menangani baris teks lebih dari %d karakter\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "baris input lebih dari %d karakter\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' bukanlah keyID panjang yang valid\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "kunci %08lX: diterima sebagai kunci terpercaya.\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "kunci %08lX muncul lebih dari satu kali dalam trustdb\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "kunci %08lX: tidak ada kunci publik untuk trusted key- dilewati\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "kunci ditandai sebagai sangat dipercaya.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req tipe %d: gagal baca: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "trust record %lu tidak dalam jenis yang diminta %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revoked] "
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expired] "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tidak dikenal"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "tidak pernah..."
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "lakukanlah --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6122,310 +6109,325 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "baris input %u terlalu panjang atau hilang LF\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "Kesalahan umum"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "tipe paket tidak dikenal"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "versi tidak dikenal"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "algoritma pubkey tidak dikenal"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "algoritma digest tidak dikenal"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "kunci publik yang buruk"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "kunci rahasia yang buruk"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "signature yang buruk"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "kesalahan checksum"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "passphrase yang buruk"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "kunci publik tidak ditemukan"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "algoritma cipher tidak dikenal"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "tidak dapat membuka keyring"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "paket tidak valid"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "armor tidak valid"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "tidak ada user id tsb"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "kunci rahasia tidak tersedia"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "digunakan kunci rahasia yang salah"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "tidak didukung"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "kunci yang buruk"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "kesalahan baca file"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "kesalahan tulis file"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "algoritma kompresi tidak dikenal"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "kesalahan buka file"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "kesalahan buat file"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "passphrase tidak valid"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritma pubkey belum diimplementasikan"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "algoritma cipher belum diimplementasikan"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "kelas signature tidak dikenal"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "kesalahan database trust"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "MPI yang buruk"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "batasan sumber daya"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "keyring tidak valid"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "sertifikat yang buruk"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "user id yang tidak benar"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "kesalahan tutup file"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "kesalahan ganti nama file"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "kesalahan hapus file"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "data tidak terduga"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "konflik timestamp"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "algoritma pubkey tidak dapat digunakan"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "file ada"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "kunci lemah"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "argumen tidak valid"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "URI yang buruk"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "URI tidak didukung"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "kesalahan jaringan"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "tidak dienkripsi"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "tidak diproses"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "kunci publik tidak dapat dipakai"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "kunci rahasia tidak dapat dipakai"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "kesalahan keyserver"
 
-#: util/errors.c:109
+#: util/errors.c:107
 #, fuzzy
 msgid "canceled"
 msgstr "Batal"
 
-#: util/errors.c:110
+#: util/errors.c:108
 #, fuzzy
 msgid "no card"
 msgstr "tidak dienkripsi"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "tidak ada data tertandai\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... kesalahan (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "y|ya"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "n|t|tidak"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "tT"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "q|k|keluar"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "kK"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 "silakan lihat http://www.gnupg.org/faq.html untuk informasi lebih lanjut\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "tidak dapat menaruh notasi data ke signature v3(gaya PGP 2.x)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "tidak dapat menaruh notasi data ke kunci signature v3 (gaya PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "tidak dapat menaruh sebuah kebijakan URL ke signature v3 (gaya PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "tidak dapat menaruh sebuah kebijakan URL ke signature v3 (gaya PGP 2.x)\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA butuh penggunaan algoritma hash 160 bit\n"
 
diff --git a/po/it.po b/po/it.po
index 095b6eede..b1786020b 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -14,92 +14,92 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "impossibile generare un numero primo di meno di %d bit\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "impossibile generare un numero primo di meno di %d bit\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "non � stato trovato il modulo per raccogliere l'entropia\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossibile eseguire stat su `%s': %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' non � un file regolare - ignorato\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "nota: il file random_seed � vuoto\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "ATTENZIONE: le dimensioni del file random_seed non sono valide - non usato\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossibile leggere `%s': %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "nota: il file random_seed non � stato aggiornato\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossibile scrivere su `%s': %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -113,7 +113,7 @@ msgstr ""
 "NON USARE ALCUN DATO GENERATO DA QUESTO PROGRAMMA!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -123,7 +123,7 @@ msgstr ""
 "po',\n"
 "visto che questo migliorer� la qualit� dell'entropia.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -135,62 +135,62 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -198,365 +198,370 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "armatura: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "header dell'armatura non valido: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "header dell'armatura: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "header della firma in chiaro non valido\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "header dell'armatura: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "firme in chiaro annidate\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armatura inaspettata:"
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "riga protetta con il trattino non valida: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematura (nessun CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematura (nel CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "CRC malformato\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "errore nel CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematura (nella coda)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armatura non valida: linea pi� lunga di %d caratteri\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "carattere quoted printable nell'armatura - probabilmente � stato usato\n"
 "un MTA buggato\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la chiave segreta non � disponibile"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 #, fuzzy
 msgid "male"
 msgstr "abilita"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "female"
 msgstr "abilita"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "unspecified"
 msgstr "Nessuna ragione specificata"
 
 # ??? (Md)
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 #, fuzzy
 msgid "not forced"
 msgstr "non esaminato"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenze aggiornate"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -564,293 +569,293 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "list all available data"
 msgstr "Chiave disponibile presso: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia la data di scadenza"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia il valore di fiducia"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "la chiave segreta non � disponibile"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ripeti la passphrase: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a meno che la chiave sia specificata con il fingerprint)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "impossibile fare questo in modo batch senza \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Vuoi cancellare questa chiave dal portachiavi? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "� una chiave segreta! - Vuoi cancellarla davvero? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "informazioni di fiducia del possessore cancellate\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "impossibile usare un pacchetto ESK simmetrico a causa della modalit� S2K\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "uso il cifrario %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "in modalit� --pgp2 puoi cifrare solo per chiavi RSA non pi� lunghe di 2048 "
 "bit\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "impossibile usare il cifrario IDEA con tutti i tipi di chiavi per cui\n"
 "stai cifrando.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -858,7 +863,7 @@ msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -867,174 +872,174 @@ msgstr ""
 "forzare l'algoritmo di compressione %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrato per: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n"
 "per il cifrario simmetrico\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "problema nella gestione del pacchetto cifrato\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "l'esecuzione remota dei programmi non � gestita\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "le chiamate a programmi esterni sono disattivate a causa dei permessi non\n"
 "sicuri del file delle opzioni\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "questa piattaforma richiede file temporanei quando si chiamano programmi "
 "esterni\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "impossibile eseguire %s \"%s\": %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "impossibile eseguire %s \"%s\": %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "errore di sistema chiamando il programma esterno: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "uscita anormale del programma esterno\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "impossibile eseguire il programma esterno\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "impossibile leggere la risposta del programma esterno: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ATTENZIONE: impossibile rimuovere la directory temporanea `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "La firma sar� marcata come irrevocabile.\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "non sono state trovate chiavi di revoca per `%s'\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoca una chiave secondaria"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "chiave segreta inutilizzabile"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chiave %08lX: non protetta - saltata\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ATTENZIONE: la chiave segreta %08lX non ha un checksum SK semplice\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1042,128 +1047,128 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1173,51 +1178,51 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1225,7 +1230,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1245,15 +1250,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1263,7 +1268,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1271,648 +1276,648 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 "NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "l'estensione crittografica \"%s\" non � stata caricata a causa dei\n"
 "permessi insicuri.\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 puoi fare solo firme in chiaro o separate\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 non puoi firmare e cifrare contemporaneamente\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "nella modalit� --pgp2 � richiesto il cifrario IDEA per cifrare un messaggio\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di cifratura \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di digest \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "non � possibile usare l'algoritmo di compressione \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
 "crittografia a chiave pubblica\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "troppe voci nella pk cache - disabilitata\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User ID non trovato]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "manca una subchiave segreta per la subchiave pubblica %08lX - ignorata\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "prende le chiavi da questo portachiavi"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "segnala i conflitti di data solo con un avvertimento"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1920,7 +1925,7 @@ msgstr ""
 "Sintassi: gpg [opzioni] [file]\n"
 "Controlla le firme con le chiavi affidabili note\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1930,7 +1935,7 @@ msgstr ""
 "terzi. Ci serve per implementare il web-of-trust; non ha nulla a che fare\n"
 "con il web-of-certificates (creato implicitamente)."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1943,16 +1948,16 @@ msgstr ""
 "segreta.\n"
 "Rispondi \"s�\" per impostare questa chiave come definitivamente affidabile\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Se vuoi usare comunque questa chiave non fidata, rispondi \"si\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Inserisci l'user ID del destinatario a cui vuoi mandare il messaggio."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1966,7 +1971,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1977,16 +1982,16 @@ msgstr ""
 "campi.\n"
 "Per favore consulta prima il tuo esperto di sicurezza."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Inserisci le dimensioni della chiave"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Rispondi \"si\" o \"no\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1998,19 +2003,19 @@ msgstr ""
 "messaggio di errore corretto: il sistema cerca di interpretare il valore\n"
 "dato come un intervallo."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Inserisci il nome del proprietario della chiave"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "Inserisci un indirizzo di email opzionale (ma fortemente suggerito)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Inserisci un commento opzionale"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2024,11 +2029,11 @@ msgstr ""
 "O  per continuare con la generazione della chiave.\n"
 "Q  per abbandonare il processo di generazione della chiave."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Rispondi \"si\" (o \"y\") se va bene generare la subchiave."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2107,12 +2112,12 @@ msgstr ""
 "\n"
 "Se non sai cosa rispondere, rispondi \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Rispondi \"si\" se vuoi firmare TUTTI gli user ID"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2120,11 +2125,11 @@ msgstr ""
 "Rispondi \"si\" se vuoi davvero cancellare questo user ID.\n"
 "Tutti i certificati saranno persi!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Rispondi \"si\" se va bene cancellare la subchiave"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2135,7 +2140,7 @@ msgstr ""
 "questa firma perch� pu� essere importante per stabilire una connessione di\n"
 "fiducia alla chiave o a un'altra chiave certificata da questa chiave."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2149,13 +2154,13 @@ msgstr ""
 "usata perch� questa chiave potrebbe stabilire una connessione di fiducia\n"
 "attraverso una chiave gi� certificata."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "La firma non � valida. Ha senso rimuoverla dal tuo portachiavi."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2170,7 +2175,7 @@ msgstr ""
 "non\n"
 "� valida per qualche ragione e ne � disponibile un'altra."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2181,23 +2186,23 @@ msgstr ""
 "la lista di preferenze corrente. L'orario di tutte le autofirme coinvolte\n"
 "sar� aumentato di un secondo.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Ripeti l'ultima passphrase per essere sicuro di cosa hai scritto."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Inserisci il nome del file a cui si riferisce la firma."
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Rispondi \"si\" se va bene sovrascrivere il file."
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2205,7 +2210,7 @@ msgstr ""
 "Inserisci il nuovo nome del file. Se premi INVIO sar� usato il nome\n"
 "predefinito (quello indicato tra parentesi)."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2234,7 +2239,7 @@ msgstr ""
 "      Usa questo per affermare che l'user ID non dovrebbe pi� essere usato;\n"
 "      solitamente � usato per indicare un indirizzo di email non valido.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2244,538 +2249,538 @@ msgstr ""
 "questo certificato di revoca. Per favore sii conciso.\n"
 "Una riga vuota termina il testo.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Non � disponibile un aiuto"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non � disponibile un aiuto per `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "chiave segreta inutilizzabile"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  nuove chiavi saltate: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         senza user ID: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "             importate: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        non modificate: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nuovi user ID: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nuove subchiavi: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             importate: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chiave %08lX: \"%s\" una nuova firma\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chiave %08lX: \"%s\" non cambiata\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
 "certificato di revoca\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chiave %08lX: revoca della subchiave non valida\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: scarico la chiave\n"
 "di revoca %08lX.\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: la chiave di\n"
 "revoca %08lX non � presente.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "portachiavi `%s' creato\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firme non controllate per mancanza delle chiavi\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Trovato un user ID senza autofirma valida\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Trovati %d user ID senza autofirme valide\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2788,63 +2793,63 @@ msgstr ""
 "impronte digitali da diverse fonti...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fido marginalmente\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi fido completamente\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'user ID \"%s\" � scaduto."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'user ID \"%s\" non � autofirmato."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "L'user ID \"%s\" non � autofirmato."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2853,11 +2858,11 @@ msgstr ""
 "L'autofirma su \"%s\"\n"
 "� una firma in stile PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vuoi promuoverla in una autofirma di OpenPGP? (s/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2866,11 +2871,11 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� scaduta\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2879,43 +2884,43 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� una firma locale.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" era gi� stato firmato localmente dalla chiave %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" era gi� stato firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare di nuovo? (s/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Questa chiave � scaduta!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Questa chiave scadr� il %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Vuoi che la tua firma scada nello stesso momento? (S/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2923,11 +2928,11 @@ msgstr ""
 "In modalit� -pgp2 non � possibile fare firme OpenPGP su chiavi in stile PGP "
 "2.x.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Questo renderebbe la chiave non utilizzabile da PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2937,32 +2942,32 @@ msgstr ""
 "appartiene veramente alla persona indicata sopra?\n"
 "Se non sai cosa rispondere digita \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Preferisco non rispondere.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non l'ho controllata per niente.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) L'ho controllata superficialmente.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) L'ho controllata molto attentamente.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2971,100 +2976,100 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Questa sar� una autofirma.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "ATTENZIONE: la firma non sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "ATTENZIONE: la firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non ho controllato per niente questa chiave.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave superficialmente.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave molto attentamente.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3072,11 +3077,11 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3084,206 +3089,206 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "cancella un user ID"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "aggiungi una chiave di revoca"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "imposta l'user ID come primario"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un user ID"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "enable key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "disable key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra l'ID fotografico"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "errore leggendo il keyblock segreto `%s': %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3291,241 +3296,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "La chiave � stata revocata."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe della firma sconosciuta"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Questo comando non � permesso in modalit� %s.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Revoco davvero questo user ID? "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3534,19 +3539,19 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3555,7 +3560,7 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3564,76 +3569,76 @@ msgstr ""
 "ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
 "            pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "armatura non valida"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3643,381 +3648,381 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un revocatore designato a una chiave in stile\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "impossibile nominare una chiave come revocatore designato di s� stessa\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ATTENZIONE: la nomina di una chiave a revocatrice designata non pu� essere\n"
 "annullata.\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
 "incrociata\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "salto una autofirma v3 sull'user ID \"%s\"\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   firmata da %08lX il %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "la preferenza %c%lu � doppia\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "scrittura della firma diretta\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifra dati"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (firma solo)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4033,7 +4038,7 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4049,40 +4054,40 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Firma valida per? (0) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s scadr� il %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4090,12 +4095,12 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 #, fuzzy
 msgid ""
 "\n"
@@ -4112,44 +4117,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4160,7 +4165,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 
@@ -4175,23 +4180,23 @@ msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4199,12 +4204,12 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4216,7 +4221,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4228,50 +4233,50 @@ msgstr ""
 "dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
 "numeri casuali migliori possibilit� di raccogliere abbastanza entropia.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4281,12 +4286,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4294,7 +4299,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4302,214 +4307,214 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crea davvero? "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "mai       "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Politica critica di firma: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Politica di firma: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Annotazione critica della firma: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Portachiavi"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "    Impronta digitale della subchiave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr " Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "     Impronta digitale della subchiave:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Impronta digitale ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � quello non modificato\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � quello nuovo\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "controllo il portachiavi `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
 "esecuzione del programma\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
@@ -4517,484 +4522,484 @@ msgstr ""
 "firmata con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, 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:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chiave di sessione cifrata con %s\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la chiave pubblica � %08lX\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifratto con %lu passphrase\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifratto con 1 passphrase\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATTENZIONE: l'integrit� del messaggio non era protetta\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "Chiave disponibile presso: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma scaduta da \""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "non � una firma separata\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 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:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo di cifratura non implementato"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "il plugin per il cifrario IDEA non � presente\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostrami ulteriori informazioni\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "usa al suo posto \"%s%s\"\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "Non compresso"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Non compresso"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "questo messaggio pu� non essere utilizzabile da %s\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Il file `%s' esiste. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffisso sconosciuto\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Inserire il nuovo nome del file"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "scrivo su stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "suppongo che i dati firmati siano in `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "creato un nuovo file di configurazione `%s'\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
 "esecuzione del programma\n"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directory creata\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ATTENZIONE: la chiave di sessione cifrata simmetricamente � potenzialmente\n"
 "non sicura\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con l'agent - uso dell'agent disattivato\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (key ID principale %08lX)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5005,28 +5010,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Ripeti la passphrase\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Inserisci la passphrase\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "impossibile chiedere la password in modo batch\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5036,21 +5041,21 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5067,164 +5072,164 @@ msgstr ""
 "molto\n"
 "grande! Dimensioni vicine a 240x288 sono una buona scelta.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Inserisci il nome del file JPEG per l'ID fotografico: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\": non � un file JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Questa foto � giusta? (s/N/q) "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "impossibile mostrare l'ID fotografico\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "Nessuna ragione specificata"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "Questa chiave � stata sostituita"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "Questa chiave � stata compromessa"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "La chiave non � pi� usata"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "L'user ID non � pi� valido"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "ragione della revoca: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "commento alla revoca: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nessun valore di fiducia assegnato a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Questa chiave probabilmente appartiene al proprietario\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Non lo so\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NON mi fido\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Mi fido definitivamente\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = torna al men� principale\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = salta questa chiave\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = abbandona\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Cosa hai deciso? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vuoi davvero assegnare fiducia definitiva a questa chiave? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificati che portano a chiavi definitivamente affidabili:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Questa chiave probabilmente appartiene al proprietario\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Questa chiave ci appartiene\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5236,112 +5241,112 @@ msgstr ""
 "rispondere s� alla prossima domanda.\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Uso lo stesso questa chiave? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "ATTENZIONE: questa chiave pu� essere stata revocata (la chiave di revoca\n"
 "non � presente).\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Questo pu� significare che la firma � stata falsificata.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa subchiave � stata revocata dal proprietario!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: questa chiave � stata disabilitata.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Nota: questa chiave � scaduta!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ATTENZIONE: questa chiave non � certificata con una firma fidata!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Non ci sono indicazioni che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma � probabilmente un FALSO.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non � sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltata: chiave pubblica gi� presente\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5349,170 +5354,170 @@ msgstr ""
 "\n"
 "Inserisci l'user ID. Termina con una riga vuota: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "saltata: chiave pubblica gi� impostata come destinatario predefinito\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "La chiave pubblica � disabilitata.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "saltata: chiave pubblica gi� impostata\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltata: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Firma separata.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Inserisci il nome del file di dati: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "viene letto stdin...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "non ci sono dati firmati\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bene, siamo il destinatario anonimo.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la vecchia codifica del DEK non � gestita\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algoritmo di cifratura %d%s � sconosciuto o disattivato\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "NOTA: l'algoritmo di cifratura %d non � stato trovato tra le preferenze\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: la chiave � stata revocata"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet fallito: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Revocabile da:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Questa � una chiave di revoca sensibile)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca per questa chiave? "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "Forzato l'output con armatura ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet fallito: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Certificato di revoca creato.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "non sono state trovate chiavi di revoca per `%s'\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "chiave segreta `%s' non trovata: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca per questa chiave? "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: Questa chiave non � protetta!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5532,126 +5537,126 @@ msgstr ""
 "disponibili\n"
 "ad altri!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "Cancella"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probabilmente volevi scegliere %d)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Inserisci una descrizione opzionale; terminala con una riga vuota:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo della revoca: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(Non � stata data una descrizione)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Va bene cos�? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "parti della chiave segreta non sono disponibili\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Passphrase non valida; riprova"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "ATTENZIONE: Individuata una chiave debole - per favore cambia ancora la\n"
 "passphrase.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "genero il checksum a 16 bit deprecato per la protezione della chiave "
 "segreta\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "creata una chiave debole - riprovo\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "Impossibile evitare una chiave debole per il cifrario simmetrico;\n"
 "ho provato %d volte!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "ATTENZIONE: conflitto del digest delle firme nel messaggio\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
 "incrociata\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "ATTENZIONE: la sottochiave per firme %08lX ha una certificature incrociata\n"
 "non valida\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la chiave pubblica %08lX � pi� recente della firma di %lu secondi\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5659,7 +5664,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5667,60 +5672,40 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: chiave per firmare %08lX scaduta il %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "si suppone una firma non valida della chiave %08lX a causa di un\n"
 "bit critico sconosciuto\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "chiave %08lX: non c'� una subchiave per il pacchetto di revoca della "
 "subchiave\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "chiave %08lX: non c'� una subchiave per la firma di collegamento della "
 "subchiave\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "impossibile inserire notation data nelle firme v3 (stile PGP 2.x)\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"impossibile inserire notation data nelle firme di chiavi v3 (stile PGP 2.x)\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "ATTENZIONE: impossibile espandere i %% nell'URL (troppo lunga). Usata "
 "inespansa.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"impossibile inserire l'URL di una policy nelle firme v3 (stile PGP 2.x)\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"impossibile inserire l'URL di una policy nelle firme di chiavi v3 (stile\n"
-"PGP 2.x)\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5729,7 +5714,7 @@ msgstr ""
 "lunga).\n"
 "Usata inespansa.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5739,76 +5724,76 @@ msgstr ""
 "lunga).\n"
 "Usata inespansa.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Firma %s da: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "nella modalit� --pgp2 puoi fare firme separate solo con chiavi in stile PGP "
 "2.x\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "In modalit� -pgp2 puoi firmare in chiaro solo con chiavi in stile PGP 2.x\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sar� usato il cifrario %s\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la chiave non � indicata come insicura - impossibile usarla con il RNG "
 "finto!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "saltata `%s': doppia\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "saltata `%s': %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "saltata %s: questa � una chiave ElGamal generata da PGP che NON � sicura per "
 "le firme!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5817,348 +5802,348 @@ msgstr ""
 "# Lista dei valori della fiducia assegnati, creata il %s\n"
 "# (Usa \"gpg --import-ownertrust\" per ripristinarli)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "riga troppo lunga\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importa i valori di fiducia"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "errore cercando il record della fiducia: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "errore di lettura: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync fallita: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek fallita: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "transazione del trustdb troppo grande\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: creazione del record della versione fallita: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: � stato creato un trustdb non valido\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creato il trustdb\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: il trustdb non � scrivibile\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb non valido\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: creazione della tabella hash fallita: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: errore durante l'aggiornamento del record di versione: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: errore durante la lettura del record di versione: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: errore durante la scrittura del record di versione: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fallita: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un file di trustdb\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: record di versione con recnum %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versione %d del file non valida\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: errore durante la scrittura del dir record: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: azzeramento di un record fallito: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: accodatura a un record fallita: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Il trustdb � danneggiato; eseguire \"gpg --fix-trust-db\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "impossibile gestire linee di testo pi� lunghe di %d caratteri\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linea di input pi� lunga di %d caratteri\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' non � un key ID lungo valido\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chiave %08lX: accettata come chiave affidabile\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "chiave %08lX: appare nel trustdb pi� di una volta\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica della chiave fidata - ignorata\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "chiavi marcate definitivamente affidabili.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, tipo %d: read fallita: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "il trust record %lu non � del tipo richiesto %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocata]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[scaduta]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "sconosciuto"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimoi controllo del trustdb sar� fatto il %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chiave pubblica %08lX non trovata: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "per favore usa --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chiavi processate (%d conteggi di validit� azzerati)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "non � stata trovata alcuna chiave definitivamente affidabile\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 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:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6173,310 +6158,327 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linea di input %u troppo lunga o LF mancante\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "errore generale"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "pacchetto di tipo sconosciuto"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "versione sconosciuta"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "algoritmo della chiave pubblica sconosciuto"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "algoritmo del digest sconosciuto"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "chiave pubblica errata"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "chiave segreta errata"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "firma errata"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "codice di controllo errato"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "passphrase errata"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "chiave pubblica non trovata"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "algoritmo di cifratura sconosciuto"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "impossibile aprire il portachiavi"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "pacchetto non valido"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "armatura non valida"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "l'user id non esiste"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "la chiave segreta non � disponibile"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "� stata usata la chiave segreta sbagliata"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "non gestito"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "chiave sbagliata"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "errore durante la lettura del file"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "errore durante la scrittura del file"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "algoritmo di compressione sconosciuto"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "errore durante l'apertura del file"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "errore durante la creazione del file"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "passphrase non valida"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmo della chiave pubblica non implementato"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "algoritmo di cifratura non implementato"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "classe della firma sconosciuta"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "errore nel database della fiducia"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "MPI danneggiato"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "limite della risorsa"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "portachiavi non valido"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "certificato danneggiato"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "user id malformato"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "errore durante la chiusura del file"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "errore durante la rinominazione del file"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "errore durante la cancellazione del file"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "dati inattesi"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "date in conflitto"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "algoritmo della chiave pubblica non utilizzabile"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "il file esiste"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "chiave debole"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "argomento non valido"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "URI non valida"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "URI non gestito"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "errore di rete"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "non cifrato"
 
 # ??? (Md)
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "non esaminato"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "chiave pubblica inutilizzabile"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "chiave segreta inutilizzabile"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "errore del keyserver"
 
-#: util/errors.c:109
+#: util/errors.c:107
 #, fuzzy
 msgid "canceled"
 msgstr "Cancella"
 
-#: util/errors.c:110
+#: util/errors.c:108
 #, fuzzy
 msgid "no card"
 msgstr "non cifrato"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "non ci sono dati firmati\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... questo � un bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "hai trovato un bug... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "si|s�"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "ATTENZIONE: si sta usando memoria insicura!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "visitare http://www.gnupg.org/faq.html per ulteriori informazioni\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "impossibile inserire notation data nelle firme v3 (stile PGP 2.x)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "impossibile inserire notation data nelle firme di chiavi v3 (stile PGP 2."
+#~ "x)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "impossibile inserire l'URL di una policy nelle firme v3 (stile PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "impossibile inserire l'URL di una policy nelle firme di chiavi v3 (stile\n"
+#~ "PGP 2.x)\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n"
 
diff --git a/po/ja.po b/po/ja.po
index 051f7823c..81a00c6b7 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -17,90 +17,90 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "pbits=%u qbits=%u���ǿ��������Ǥ��ޤ���\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "%d �ӥå�̤�����ǿ��������Ǥ��ޤ���\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "����ȥ��ԡ������⥸�塼�뤬�����Ф���Ƥ��ޤ���\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "��%s�פ����å��Ǥ��ޤ���\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "��%s�פ�Ĵ�٤뤳�Ȥ��Ǥ��ޤ���: %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "��%s�פ����̤Υե�����ǤϤ���ޤ��� - ̵��\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "����: random_seed �ե�����϶��Ǥ�\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "�ٹ�: ̵����Ĺ���� random_seed �ե����� - �Ȥ��ޤ���\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "��%s�פ��ɤ�ޤ���: %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "��%s�פ˽񤭹���ޤ���: %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "��%s�פ��Ĥ����ޤ���: %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "�ٹ�: ���ݤ���������Ҥ��Ȥ��Ƥ��ޤ�!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -114,7 +114,7 @@ msgstr ""
 "���Υץ����������������ǡ�������ڻȤäƤϤ����ޤ���!!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -123,7 +123,7 @@ msgstr ""
 "�𻨤���������Ƥ��ޤ��Τǡ����Ԥ������������𻨤��μ�������\n"
 "���ޤ��Τǡ��⤷˰�����鲿����Ȥ��Ƥ���������\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -134,62 +134,62 @@ msgstr ""
 "��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
 "�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "���������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr "�����˸������ǡ������ޤޤ�Ƥ��ޤ���\n"
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
@@ -197,346 +197,351 @@ msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 #, fuzzy
 msgid "|AN|New Admin PIN"
 msgstr "|A|������Admin PIN"
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 #, fuzzy
 msgid "|N|New PIN"
 msgstr "������PIN"
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������PIN�μ������顼: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 msgid "error reading application data\n"
 msgstr "���ץꥱ������󡦥ǡ������ɽФ����顼\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 msgid "error reading fingerprint DO\n"
 msgstr "����ǡ��������֥������Ȥ��ɽФ����顼\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 msgid "key already exists\n"
 msgstr "���Ϥ⤦����ޤ�\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr "��¸�θ��ϸ򴹤���ޤ�\n"
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 msgid "generating new key\n"
 msgstr "��������������\n"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr "�������δ֡����Ԥ��������� ...\n"
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 msgid "generating key failed\n"
 msgstr "���������˼��Ԥ��ޤ���\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "������������λ���ޤ��� (%d��)\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, fuzzy, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [��̾��: %lu]"
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "����: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "̵���������إå���: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "�����إå���: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "̵���ʥ��ꥢ��̾�إå���\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "�����إå���: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "����ҤΥ��ꥢ��̾\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 msgid "unexpected armor: "
 msgstr "ͽ����������: "
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "̵���ʥ��å���ǥ��������פ��줿��: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "̵����64��ʸ��%02X��ȤФ��ޤ���\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "�ե������������᤹���ޤ� (CRC������ޤ���)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "�ե������������᤹���ޤ� (CRC������)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "CRC�ν񼰤�����������ޤ���\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC���顼��%06lX - %06lX\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 msgid "premature eof (in trailer)\n"
 msgstr "�ե������������᤹���ޤ� (����������ˤ���ޤ�)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "�����ιԤ˥��顼������ޤ�\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "���������quoted printableʸ��������ޤ��������餯�Х��Τ���\n"
 "MTA��Ȥä��ΤǤ��礦\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP������no. %s�򸡽�\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "�����? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr "[̤����]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 msgid "male"
 msgstr "��"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "female"
 msgstr "��"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "unspecified"
 msgstr "̵����"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "not forced"
 msgstr "̤����"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr "����"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "���顼�� �Τ٤����ASCII�������������Ĥ���Ƥ��ޤ���\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "���顼: ��<��ʸ���ϻȤ��ޤ���\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "���顼: ��Ťζ���϶ػߤǤ���\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr "�����ɽ�ͭ�Ԥ��� (surname): "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr "�����ɽ�ͭ�Ԥ�̾ (given name): "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "���顼: �Ĥʤ���̾����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 msgid "URL to retrieve public key: "
 msgstr "��������õ������URL: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr "�������󡦥ǡ��� (���������̾): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "���顼: �������󡦥ǡ�����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, fuzzy, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 msgid "Language preferences: "
 msgstr "���������: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 msgid "Error: invalid length of preference string.\n"
 msgstr "���顼: ����ʸ�����Ĺ����̵���Ǥ���\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 msgid "Error: invalid characters in preference string.\n"
 msgstr "���顼: ����ʸ�����̵����ʸ��������ޤ���\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "���� ((M)�ˡ�(F)��������): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 msgid "Error: invalid response.\n"
 msgstr "���顼: ̵���ʱ�����\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 msgid "CA fingerprint: "
 msgstr "CA���: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "���顼: ̵���ʷ����λ��档\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "�������Ǥ��ޤ���: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 msgid "not an OpenPGP card"
 msgstr "OpenPGP�����ɤǤ���ޤ���"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr "��¸�θ���򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "�Ź渰�򥫡��ɳ��˥Хå����åפ��ޤ���? (Y/n) "
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr "��¸�θ�����򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -547,138 +552,138 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "���Υ��ޥ�ɤ�Ȥä��ѹ����٤��Ǥ� --change-pin\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 msgid "Please select the type of key to generate:\n"
 msgstr "�������븰�η������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 msgid "   (1) Signature key\n"
 msgstr "   (1) ��̾��\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �Ź沽��\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr "   (3) ǧ�ڸ�\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 msgid "Please select where to store the key:\n"
 msgstr "�����ݴɾ������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 msgid "unknown key protection algorithm\n"
 msgstr "̤�Τθ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 msgid "secret parts of key are not available\n"
 msgstr "������̩��ʬ��̵���Ǥ�\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 msgid "secret key already stored on a card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "show admin commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "list all available data"
 msgstr "��ͭ���ǡ�����ɽ��"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr "�����ɽ�ͭ�Ԥ�̾�����ѹ�"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr "����õ������URL���ѹ�"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr "������URL�ǻ��ꤵ�줿���ΰ����Ф�"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change the login name"
 msgstr "��������̾���ѹ�"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "change the language preferences"
 msgstr "�����������ѹ�"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr "�����ɽ�ͭ�Ԥ����̤��ѹ�"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "change a CA fingerprint"
 msgstr "CA������ѹ�"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr "��̾����PIN�ե饰��ȿž"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 msgid "generate new keys"
 msgstr "����������������"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr "PIN�֥��å��β�����ѹ��Υ�˥塼"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 msgid "Admin-only command\n"
 msgstr "�������ѥ��ޥ��\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 msgid "Admin commands are allowed\n"
 msgstr "�������ޥ�ɤ����Ĥ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 msgid "Admin commands are not allowed\n"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "��̩���������ޤ���"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "�����ɤ�������return���ǤĤ���'c'�Ǽ�ä�: "
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -687,302 +692,302 @@ msgstr ""
 "���Υ����ɤ�ȴ�����������֤Τ��������Ƥ�������:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "�Ѱդ���return���ǤĤ���'c'�Ǽ�ä�: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Admin PIN������: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "PIN������: "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr "Admin PIN������: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr "PIN������: "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 msgid "Repeat this PIN: "
 msgstr "PIN�������: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "���֥��å����ɽФ����顼: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(���뤤�ϡ�����Ǹ������)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "��--yes�ɤΤʤ��Хå����⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "���θ����ؤ��������ޤ���? (y/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "�������̩���Ǥ�! �����˺�����ޤ���? (y/N) "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "��ͭ�Կ��Ѿ���򥯥ꥢ���ޤ���\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "���θ������ˤ���������̩����%s�ɤ�����ޤ�!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-keys�ɥ��ץ����Ǥ���������Ƥ���������\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K�⡼�ɤΤ��ᡢ�о�ESK�ѥ��åȤ�Ȥ��ޤ���\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "%s�Ź�ˡ��Ȥ��ޤ�\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "��%s�פϤ⤦���̺ѤߤǤ�\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�ٹ�: ��%s�פ϶��Υե�����Ǥ�\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�2048�ӥåȰʲ���RSA���ǰŹ沽�����Ǥ��ޤ���\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "��%s�פ����ɤ߽Ф��ޤ�\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "�Ź沽���褦�Ȥ��Ƥ��븰������IDEA�Ź��Ȥ��ޤ���\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: �оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "�ٹ�: ���̥��르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s�Ź沽 ������:��%s��\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ���\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "̤�ΤΥ��르�ꥺ��%d�ˤ��Ź沽\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "�ٹ�: ��å��������оΰŹ�ˡ�μ夤���ǰŹ沽����Ƥ��ޤ���\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "�Ź沽�ѥ��åȤμ谷���Ǿ㳲\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "��֥ץ������μ¹Ԥϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "���ץ���󡦥ե�����ε��ĥ⡼�ɤ��������ǤϤʤ��Τǡ�\n"
 "�����ץ������θƽФ��ϡ����ѶػߤǤ���\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "���Υץ�åȥۡ�����ȡ������ץ������θƽФ��ˤϡ�����ե����뤬ɬ�פǤ�\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "��%s�פ�¹ԤǤ��ޤ���: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "�������%s�פ�¹ԤǤ��ޤ���: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "�����ץ������θƽФ��ǥ����ƥࡦ���顼: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "�����ץ�����ब���Լ����˽�λ\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "�����ץ�������¹ԤǤ��ޤ���\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "�����ץ������α������ɤ߽Ф��ޤ���: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "�ٹ�: ����ե���������Ǥ��ޤ��� (%s) ��%s��: %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "�ٹ�: ����ǥ��쥯�ȥ꡼��%s�פ����Ǥ��ޤ���: %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "��%s���Ѥμ����������Ĥ���ޤ���\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "�������"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "���ѤǤ��ʤ���̩���Ǥ�"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 msgid "exporting secret keys not allowed\n"
 msgstr "��̩���ν�Ф��϶ػߤǤ�\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "��%s: �ݸ��Ƥ��ޤ��� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "��%s: PGP 2.x�����θ��Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�ٹ�: ��̩��%s�ˤϡ�ñ���SK�����å����ब����ޤ���\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -990,127 +995,127 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "�����"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "list and check key signatures"
 msgstr "����̾�θ����Ȱ���"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰������"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "���������������"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "�������С��θ��򸡺�����"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰��������������"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr "�����ɾ��֤�ɽ��"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr "�����ɤΥǡ������ѹ�"
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr "�����ɤ�PIN���ѹ�"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1120,55 +1125,55 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "������˳�ǧ"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr "��̩��OpenPGP�ο�������"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x�ߴ��Υ�å�����������"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1177,7 +1182,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1197,15 +1202,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1215,7 +1220,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1223,631 +1228,631 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź�ˡ��ĥ��%s�פ�����ɤ��ޤ���\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����default-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 msgid "[User ID not found]"
 msgstr "[�桼����ID�����Ĥ���ޤ���]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "���θ����ؤ��������ޤ�"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "������̷���ٹ�����ˤ��ޤ�"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭹���"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpgv [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1855,7 +1860,7 @@ msgstr ""
 "��ʸ: gpg [���ץ����] [�ե�����]\n"
 "���Το��Ѥ������ǽ�̾�򸡺�\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1865,7 +1870,7 @@ msgstr ""
 "���󶡤���ޤ��󡣤���ϡ�web-of-trust �μ�����ɬ�פǡ�\n"
 "(����Ū�ˤǤ���) web-of-certificates �Ȥ�̵�ط��Ǥ���"
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1877,16 +1882,16 @@ msgstr ""
 "�븰�Τ��ȤǤ������θ�������Ū�˿��Ѥ��뤳�Ȥˤ���ʤ顢\n"
 "��yes�ɤ������Ƥ���������\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "���ο��ѤǤ��ʤ�����Ȥ������ʤ���С���no�ɤ������Ƥ���������"
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "���ʤ��������å���������Υ桼����ID�����Ϥ��Ƥ���������"
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1909,7 +1914,7 @@ msgstr ""
 "\n"
 "�ǽ�θ�(�縰)�ϡ���̾�˻��ѤǤ��븰�Ǥʤ���Фʤ�ޤ���"
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1919,16 +1924,16 @@ msgstr ""
 "���Υ��르�ꥺ��ϡ�������ϰ�������ǻȤ���٤��Ǥ���\n"
 "�ޤ����������ƥ���������Ȥˤ����̤���������"
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "����Ĺ�������Ϥ��Ƥ�������"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "��yes�ɤ���no�ɤ������Ƥ�������"
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1940,19 +1945,19 @@ msgstr ""
 "ɽ������ʤ��Ǥ��礦���������ꡢ�����ƥ�������ͤ���֤��Ѵ�\n"
 "����褦�˻�ߤޤ���"
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "����ͭ�Ԥ�̾�������Ϥ��Ƥ�������"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "���ץ����Ǥ������Żҥ᡼��Υ��ɥ쥹�����Ϥ��뤳�Ȥ򶯤��侩���ޤ�"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "���ץ����Υ����Ȥ����Ϥ��Ƥ�������"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1966,11 +1971,11 @@ msgstr ""
 "O  ��������³�ԡ�\n"
 "Q  �������ν�λ��"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "�������������Ƥ褱��С���yes��(�ޤ��ϡ�ñ�ˡ�y��) �������Ƥ���������"
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2039,11 +2044,11 @@ msgstr ""
 "\n"
 "���������Τ狼��ʤ����ϡ���0�פ������Ƥ���������"
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "���Ƥ� �桼����ID�˽�̾��������С���yes�ɤ������Ƥ�������"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2051,11 +2056,11 @@ msgstr ""
 "���Υ桼����ID�������˺����������С���yes�ɤ������Ƥ���������\n"
 "�����������Ʊ���˾õ�ޤ�!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "���������������Ƥ褱��С���yes�ɤ������Ƥ�������"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2065,7 +2070,7 @@ msgstr ""
 "�Ϥʤ��Ǥ��礦���ʤ��ʤ顢���ν�̾�ϡ����ؤο��Ѥ��ؤκ����䡢\n"
 "���θ��ˤ������ˤȤäƽ��פ�����Ǥ���"
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2077,7 +2082,7 @@ msgstr ""
 "�ʤ��ʤ顢���ν�̾�θ��ϡ��⤦�������줿¾�θ��ǿ��Ѥ��ؤ��������\n"
 "���⤷��ʤ�����Ǥ���"
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2085,7 +2090,7 @@ msgstr ""
 "���ν�̾��ͭ���ǤϤ���ޤ��󡣤��Τ��Ȥϡ����ʤ��θ��ؤ��������٤���\n"
 "�Ȥ�����̣�Ǥ���"
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2098,7 +2103,7 @@ msgstr ""
 "����ޤ��󡣤�äơ����μ��ʽ�̾�����餫����ͳ�ˤ��ͭ���ǤϤʤ��ơ�\n"
 "���ؤȤʤ븰��������ˤΤߡ������¹Ԥ��Ƥ���������"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2107,23 +2112,23 @@ msgstr ""
 "���� (�ޤ������򤷤�) �桼����ID�������򡢺��������������ѹ�\n"
 "���ޤ����ط����뼫�ʽ�̾�������ϡ�1�ä����ߤޤ���\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "���Ϥ����ѥ��ե졼���γ�ǧ�Τ��ᡢ�����Ϥ��Ƥ���������"
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "��̾��Ԥ��ե������̾������ꤷ�Ƥ�������"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "��񤭤��Ƥ褱��С���yes�ɤ������Ƥ�������"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2131,7 +2136,7 @@ msgstr ""
 "�������ե�����̾�����Ϥ��Ƥ���������ñ��RETURN���ǤĤȡ�\n"
 "(��̤Ǽ�����) ����Υե�����̾����Ѥ��ޤ���"
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2160,7 +2165,7 @@ msgstr ""
 "      �ޤ�����������̡��Żҥ᡼��Υ��ɥ쥹��̵���ˤʤä���\n"
 "      ���˻Ȥ��ޤ���\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2170,531 +2175,531 @@ msgstr ""
 "ʸ�Ϥ����Ϥ��뤳�Ȥ��Ǥ��ޤ���ʸ�Ϥϴʷ�ˤ��Ƥ���������\n"
 "���Ԥǽ����ˤʤ�ޤ���\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "�إ�פϤ���ޤ���"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "��%s�פΥإ�פϤ���ޤ���"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "���ѤǤ��ʤ���̩���Ǥ�"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "��%d�Υ֥��å���ȤФ��ޤ�\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu���ޤǽ���\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "    ��������: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "�ȤФ�����������: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "  �桼����ID�ʤ�: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "          �ɹ���: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        �ѹ��ʤ�: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "�������桼����ID: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      ����������: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "      ��������̾: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  �����������: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ��̩�����ɹ���: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  ̵�ѹ�����̩��: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        ̤�ɹ���: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "  ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, fuzzy, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "�ٹ�: ��%s�ˤϡ������ԲĤȤ�������������ޤ�\n"
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "�����Υ桼����ID�Υ��르�ꥺ��:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": �Ź楢�르�ꥺ������� %s\n"
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": ���󥢥르�ꥺ������� %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": ���̥��르�ꥺ������� %s\n"
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "it is strongly suggested that you update your preferences and\n"
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "����Ū�ʥ��르�ꥺ���԰���������򤱤뤿�ᡢ���θ�������ۤ��Ƥ�������\n"
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "�ʲ��ǡ������������Ǥ��ޤ�: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "��%s: �桼����ID������ޤ���\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "��%s: PKS��������¤����\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "��%s: ��������̤���ʽ�̾�Υ桼����ID��%s��\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "��%s: ͭ���ʥ桼����ID������ޤ���\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "��%s: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "��%s�פؤν����\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "��%s: ��������%s�ɤ��ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "��%s: �������ʣ���ȹ礤�ޤ���\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å����ɤ߽Ф��ޤ���: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "��%s:��%s�ɿ������桼����ID��1��\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "��%s:��%s�ɿ�������̾��1��\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "��%s:��%s�ɿ�����������1��\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "��%s:��%s�ɿ�����������%d��\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "��%s:��%s���ѹ��ʤ�\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "��%s: ̵���ʰŹ�ˡ%d����̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "��̩�����ɹ��ߤ϶ػߤǤ�\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�������̩���ؤ�����ޤ���: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "��%s: ��̩�����ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "��%s: �⤦��̩���ؤˤ���ޤ�\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "��%s: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "��%s: ������������ޤ��� - �����������Ŭ�ѤǤ��ޤ���\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "��%s: ̵���ʼ���������: %s - ����\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "��%s:��%s�ɼ�����������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "��%s: ��̾���б�����桼����ID������ޤ���\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤμ��ʽ�̾����̵���Ǥ�\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "��%s: �����б���������������ޤ���\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "��%s: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "��%s: ̵�����������б��Ǥ�\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "��%s: ¿���������б��������ޤ�\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "��%s: �������ˤ�����������������ޤ���\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "��%s: ̵�������������Ǥ�\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "��%s: ̵����������¿�ż����������ޤ�\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "��%s: �ȤФ����桼����ID��%s��\n"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "��%s: �ȤФ�������\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "��%s: ��Ф��ԲĤʽ�̾ (���饹%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "��%s: ���������񤬸��ä����ꤵ��Ƥ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "��%s: ̵���ʼ���������: %s - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "��%s: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s�ΰ����Ф�\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s���Ժߡ�\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "��%s:��%s�ɼ�����������ɲ�\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "��%s: ľ�ܸ���̾���ɲ�\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "���ء�%s�פ��Ǥ��ޤ���\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[����]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[���ʽ�̾]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "�����ʽ�̾1��\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "�����ʽ�̾%d��\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "�����ʤ�����1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "�����ʤ�����%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "���顼�Τ���1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "���顼�Τ���%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2705,17 +2710,17 @@ msgstr ""
 "��\n"
 "(�ѥ��ݡ��Ȥ򸫤��Ƥ��ä��ꡢ¾������������򸡺������ꡢ�ʤɤʤ�)\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = �������ٿ��Ѥ���\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = �����˿��Ѥ���\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2724,46 +2729,46 @@ msgstr ""
 "���ѽ�̾�ο��������Ϥ��Ƥ���������\n"
 "������1����礭���ȡ���̾���褦�Ȥ��Ƥ��븰�ǿ��ѽ�̾����ޤ���\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "��̾�����¤���ɥ᡼�󤫡�����Τʤ�����enter�����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  ��̾��ǽ��\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�桼����ID��%s�ɤϡ���λ�Ǥ���"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2772,11 +2777,11 @@ msgstr ""
 "��%s�ɤˤ������뼫�ʽ�̾�ϡ�\n"
 "PGP 2.x�����ν�̾�Ǥ���\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "OpenPGP�μ��ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2785,11 +2790,11 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "����λ�Ǥ���\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "��������̾��ȯ�Ԥ��������ڤ��̾�ȸ򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2798,53 +2803,53 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "��������̾�Ǥ���\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦������̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "����Ǥ�ƽ�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "��%s�ǽ�̾���٤���ΤϤ���ޤ���\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "���θ�����λ�Ǥ�!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���θ���%s����λ���ޤ���\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Ʊ���˽�̾����λ�ˤ������Ǥ���? (Y/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x����OpenPGP��̾���Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���θ���PGP 2.x�ǻ��ѤǤ��ʤ��ʤ�ޤ���\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2853,32 +2858,32 @@ msgstr ""
 "��̾���褦�Ȥ��Ƥ��븰���ºݤ˾嵭��̾���οͤΤ�Τ��ɤ������ɤ�����\n"
 "���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ���С���0�ɤ����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) �����ޤ���%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) �������������Ƥ��ޤ���%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ������������ޤ�����%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ���ʤ����դ��Ƹ������ޤ�����%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�����? (�ܺ٤� '?' ��): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2887,75 +2892,75 @@ msgstr ""
 "�����ˤ��θ��ˤ��ʤ��θ���%s�ɤǽ�̾���Ƥ褤�Ǥ���\n"
 "(%s)\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 msgid "This will be a self-signature.\n"
 msgstr "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "�ٹ�: ��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "�ٹ�: ��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "I have not checked this key at all.\n"
 msgstr "���θ����������������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 msgid "I have checked this key casually.\n"
 msgstr "���θ��ϰ�����������ޤ�����\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 msgid "I have checked this key very carefully.\n"
 msgstr "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2963,11 +2968,11 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2976,206 +2981,206 @@ msgstr ""
 "�����餯����ϡ������Ǥ�ʤ����ͤ��Ǥ�!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 msgid "Do you really want to do this? (y/N) "
 msgstr "�����˼¹Ԥ��ޤ���? (y/N) "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "�����ɽ��"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "��̾�μ���"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "�ե���ID���ɲ�"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�桼����ID�κ��"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "move a backup key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "������"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "���������ɲ�"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�桼����ID���ˤ���"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "�����ΰ��� (�������ѡ���)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "�����ΰ��� (��Ĺ)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "��������������URI������"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�桼����ID�μ���"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "enable key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "disable key"
 msgstr "���λ��Ѥ�ػߤ���"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "�ե���ID��ɽ��"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "��̩���֥��å���%s�ɤ��ɽФ����顼: %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�ޤ���toggle�ɥ��ޥ�ɤ�ȤäƤ���������\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3183,159 +3188,159 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "���ϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 msgid "Really sign all user IDs? (y/N) "
 msgstr "���������桼����ID�˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "̤�Τν�̾���饹�Ǥ�"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ϶ػߤǤ���\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 msgid "Really remove this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 msgid "Really move the primary key? (y/N) "
 msgstr "���μ縰�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 msgid "You must select exactly one key.\n"
 msgstr "���򤭤ä���1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "���򤷤����������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "���θ��������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 msgid "Really revoke this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "���򤷤����������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "���ѼԻ��꿮�ѥǡ����١����������桢��ͭ�Կ��Ѥ����ꤵ��ʤ����Ȥ⤢���"
 "����\n"
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 msgid "Set preference list to:\n"
 msgstr "�������������:\n"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 msgid "Really update the preferences? (y/N) "
 msgstr "�����������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 msgid "Save changes? (y/N) "
 msgstr "�ѹ�����¸���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 msgid "Quit without saving? (y/N) "
 msgstr "��¸�����˽�λ���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ��������פǤ���\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "����: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "��ǽ: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr "̵�����������С�"
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "������������: "
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3343,71 +3348,71 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 msgid "(sensitive)"
 msgstr "(�ǥꥱ����)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, c-format
 msgid "created: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, c-format
 msgid "revoked: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, c-format
 msgid "expires: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, c-format
 msgid "usage: %s"
 msgstr "����ˡ: %s"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, c-format
 msgid "trust: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr "ͭ����: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr "�������ֹ�: "
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3415,17 +3420,17 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "����"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "��λ"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3433,7 +3438,7 @@ msgstr ""
 "�ٹ�: �礿��桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
 "              �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3442,75 +3447,75 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "̵���������Ǥ�"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3519,359 +3524,359 @@ msgstr ""
 "�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "�ٹ�: ��̾����%s�ϡ���߾����Ǥ���ޤ���\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�����˸򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�����˺���������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "��̾����: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��񤭤��ޤ���? (y/N) "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�桼����ID:��%s��\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s����λ�Ǥ���\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 msgid " (non-revocable)"
 msgstr " (�����Բ�)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "����������������˺������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "������%s�פν�ʣ\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "¿������Ź�ˡ����\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "¿��������������\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "¿�����밵������\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "����ʸ�����̵���ʹ��ܡ�%s�פ�����ޤ�\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "ľ�ܽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "���б��ؤν�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵���ʸ�Ĺ��%u�ӥåȤˤ��ޤ�\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��Ĺ��%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr "Authenticate"
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "��%s�˲�ǽ�����: "
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr "������ǽ�����: "
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) ��̾�Ϥ�ȿž\n"
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) �Ź��Ϥ�ȿž\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) ǧ���Ϥ�ȿž\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) ��λ\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "����˾�θ��μ�������򤷤Ƥ�������:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA��Elgamal (����)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3887,7 +3892,7 @@ msgstr ""
 "      <n>m = ���� n ����֤���λ\n"
 "      <n>y = ���� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3903,40 +3908,40 @@ msgstr ""
 "      <n>m = ��̾�� n ����֤���λ\n"
 "      <n>y = ��̾�� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "��̾��ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s��%s����λ���ޤ�\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3944,11 +3949,11 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ���������갷���ޤ���\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 msgid "Is this correct? (y/N) "
 msgstr "������������Ǥ���? (y/N) "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3964,44 +3969,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ�������%s�פ�ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4012,7 +4017,7 @@ msgstr ""
 "    ��%s��\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
@@ -4027,23 +4032,23 @@ msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4051,12 +4056,12 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4068,7 +4073,7 @@ msgstr ""
 "�Ρ�--edit-key�ɥ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4079,50 +4084,50 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤤ�����ޤ���\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "�������������ä���ޤ�����\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�������������̾���ޤ�����\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4131,698 +4136,698 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ɥ��ޥ�ɤ�Ȥä��������������Ƥ���������\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 msgid "Really create? (y/N) "
 msgstr "�����˺������ޤ���? (y/N) "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�����ɤؤθ����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "����: �����ɸ��ΥХå����åפ���%s�פ���¸����ޤ�\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "̵����    "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "����ƥ�����ʽ�̾�ݥꥷ��: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "��̾�ݥꥷ��: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "����������������: "
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "����ƥ�����ʽ�̾����: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "��̾����: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "����"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "�縰�λ���:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "�������:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr " �縰�λ���:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr " �������:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 msgid "      Key fingerprint ="
 msgstr "                 ���� ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr "         �����ɤ����� ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "��%s�פ����%s�פؤΰ�ư�˼���: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�ٹ�: ���Ѿ�����ä�2�ĤΥե����뤬¸�ߤ��ޤ���\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s���ѹ��Τʤ����Ǥ�\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s�Ͽ��������Ǥ�\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "��������Ū�ʰ�����η�٤������Ƥ�������\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "���ء�%s�פ򥭥�å��夷�ޤ�\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu�Ĥθ��ޤǥ���å���� (%lu�Ĥν�̾)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu�Ĥθ��򥭥�å���� (%lu�Ĥν�̾)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "�ٹ�: �������С��Υ��ץ�����%s�פϡ����Υץ�åȥۡ���ǤϻȤ��ޤ���\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "�ֹ�(s)��N)�����ޤ���Q)��ߤ����Ϥ��Ƥ������� >"
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "̵���ʸ������С����ץ��ȥ���Ǥ� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "����%s�ɤ��������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 msgid "key not found on keyserver\n"
 msgstr "�����������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "��%s��%s���饵���С�%s���׵�\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "��%s��%s���׵�\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��%s��%s������%s������\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "��%s��%s������\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 msgid "no keyserver action!\n"
 msgstr "�������С�����������󤬤���ޤ���!\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "�ٹ�: ���� (%s) ��GnuPG�θ������С����ϥ�ɥ�\n"
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr "�������С���VERSION���������ޤ���Ǥ���\n"
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "���Τθ������С�������ޤ��� (���ץ����--keyserver��Ȥ��ޤ��礦)\n"
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "���ι��ۤǤϡ������������С��θƽФ��ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "�������С������������%s���ѤΥϥ�ɥ餬����ޤ���\n"
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "����%s�פϡ��������С������������%s�פǥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s�ϡ��ϥ�ɥ�%d�Ǥ򥵥ݡ��Ȥ��ޤ���\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 msgid "keyserver timed out\n"
 msgstr "�������С��Υ����ॢ����\n"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 msgid "keyserver internal error\n"
 msgstr "�������С����������顼\n"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "�������С��̿����顼: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "��%s�ɸ�ID�ǤϤ���ޤ���: �ȤФ��ޤ�\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�Ѥ�Ĺ���ΰŹ沽�Ѥߥ��å���� (%d)\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s �Ź沽�Ѥߥ��å����\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "̤�Τ����󥢥르�ꥺ����������줿�ѥ��ե졼�� %d\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, c-format
 msgid "public key is %s\n"
 msgstr "��������%s�Ǥ�\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "�������ˤ��Ź沽�Ѥߥǡ���: ������DEK�Ǥ�\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-�ӥå�%s��, ID %s, ����%s�˰Ź沽����ޤ���\n"
 
-#: g10/mainproc.c:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      ��%s��\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s��, ID %s�ǰŹ沽����ޤ���\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ�������\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA�Ź�ˡ��������ǽ�ʤΤǡ���ŷŪ�Ǥ���%s�����Ѥ��褦�Ȥ��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "���������\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�ٹ�: ��å������δ��������ݸ��Ƥ��ޤ���\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "����: �����Ԥϡ����ˤ���ɤ褦�˵��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "��Ω��������gpg --import�ɤ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, c-format
 msgid "Signature made %s\n"
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s��%s�����\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s��%s��ID %s�ǻܤ��줿��̾\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "�ʲ��˸�������ޤ�: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "��%s�ɤ���� ������ ��̾"
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "��%s�ɤ���δ����ڤ�ν�̾"
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[�Գ���]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                ��̾��%s��"
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�����ڤ�ν�̾ %s\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "�Х��ʥ꡼"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "�ƥ����ȥ⡼��"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "̤�Τ�"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡺��Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "�ٹ�: ¿�Ž�̾�θ��С��ǽ�Τ�Τ����������ޤ���\n"
 
-#: g10/mainproc.c:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥ롼�ȡ��ѥ��åȤ򸡽Ф��ޤ���\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "����������פ���ѶػߤˤǤ��ޤ���: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "��%s�פ�fstat��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "̤�����ΰŹ楢�르�ꥺ��Ǥ�"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA�Ź�ˡ�Υץ饰���󤬤���ޤ���\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ����뤵��Ƥ��륪�ץ�����%s��\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "��%s%s�ɤ�����˻ȤäƤ�������\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "̵����"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 msgid "uncompressed|none"
 msgstr "̵����|�ʤ�"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ޤ���\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�����ޤ��ʥ��ץ�����%s��\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "�ե������%s�פϴ���¸�ߤ��ޤ���"
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 msgid "Overwrite? (y/N) "
 msgstr "��񤭤��ޤ���? (y/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ̤�Τγ�ĥ��\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "�������ե�����̾�����Ϥ��Ƥ�������"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "ɸ����Ϥ˽񤭹��ߤޤ�\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "��̾���줿�ǡ�������%s�פˤ�������ꤷ�ޤ�\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "�����������ե������%s�פ��Ǥ��ޤ���\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "�ٹ�: ��%s�פΥ��ץ����ϵ�ư���Ƥ���֡�ͭ���ˤʤ�ޤ���\n"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ沽���å���󸰤Ǥ�\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "����������Ȥ˾㳲: ��������������Ѷػ�\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (�縰ID %s)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4833,27 +4838,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u�ӥå�%s��, ID %s�������դ�%s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "�ѥ��ե졼���������\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "�ѥ��ե졼��������\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr "�Хå����⡼�ɤǥѥ��ե졼������礻�Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "�ѥ��ե졼��������: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4862,21 +4867,21 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�:��%s��\n"
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u�ӥå�%s��, ID %s�������դ�%s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (�縰ID %s ������)"
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "�ѥ��ե졼���������: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4890,153 +4895,153 @@ msgstr ""
 "���Ƥ����ޤ��礦���⤷�礭�ʼ̿���Ȥ��ȡ����ʤ��θ���Ʊ�ͤ��礭���ʤ�\n"
 "�ޤ�! 240x288���餤�ˤ����ޤ��礭���β����ϡ��Ȥ��褤�Ǥ��礦��\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "�ե���ID�Ѥ�JPEG�ե�����̾�����Ϥ��Ƥ�������: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "JPEG�ե������%s�פ������ޤ���: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "����JPEG�ϡ��������礭�� (%d�Х���) !\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "�����˻Ȥ������Ǥ���? (y/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "��%s�פϡ�JPEG�ե�����ǤϤ���ޤ���\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "���μ̿����������Ǥ��� (y/N/q)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "�ե���ID��ɽ����ǽ!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "��ͳ�ϻ��ꤵ��Ƥ��ޤ���"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "�����Ȥ꤫��äƤ��ޤ�"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "�����ѥ����ޤ���"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "���Ϥ⤦���ѤǤ�"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "�桼����ID���⤦ͭ���Ǥ���ޤ���"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "������ͳ: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "����������: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 msgid "No trust value assigned to:\n"
 msgstr "�����٤����ꤵ��Ƥ��ޤ���:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  ��̾��%s��\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "���θ������Υ桼������ʤΤ��ܿͤΤ�Τ��ɤ������ɤ줯�餤���ѤǤ��ޤ���?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = �Τ�ʤ����ޤ��ϲ��Ȥ�����ʤ�\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = ���Ѥ� �ʤ�\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = ����Ū�˿��Ѥ���\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 msgid "  m = back to the main menu\n"
 msgstr "  m = �᡼�󡦥�˥塼�����\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  s = skip this key\n"
 msgstr "  s = ���θ��ϤȤФ�\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  q = quit\n"
 msgstr "  q = ��λ\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr "���θ��κǾ����ѥ�٥�: %s\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "���ʤ��η����? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "�����ˤ��θ�������Ū�˿��Ѥ��ޤ���? (y/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "����Ū�˿��Ѥ������ؤξ�����:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: ���θ����������ܿͤΤ�ΤǤ��롢�Ȥ���������������ޤ���\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: ���θ����������ܿͤΤ�ΤǤ��롢�Ȥ�����������������������ޤ���\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 msgid "This key probably belongs to the named user\n"
 msgstr "���θ��Ϥ��֤��ܿͤΤ�ΤǤ�\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "���θ��ϼ�ʬ�Τ�ΤǤ�\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5046,105 +5051,105 @@ msgstr ""
 "�ޤ��󡣺�����Ԥ����Ȥ�������ˡ����򤷤Ƥ��ʤ����ˤϡ�\n"
 "���μ���ˤ�no�������Ƥ���������\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 msgid "Use this key anyway? (y/N) "
 msgstr "����Ǥ⤳�θ���Ȥ��ޤ���? (y/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "�ٹ�: ���ѤǤ��ʤ�����ȤäƤ��ޤ�!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "�ٹ�: ���θ��ϼ������줿�褦�Ǥ� (���������Ժ�)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "�ٹ�: ���θ��ϻ�̾�����Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "�ٹ�: ���θ��Ͻ�ͭ�Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "         This could mean that the signature is forged.\n"
 msgstr "      ��̾����ʪ�ʤ��Ȥ⤢�롢�Ȥ������ȤǤ���\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "�ٹ�: ���������Ͻ�ͭ�Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "����: ���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ���\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "����: ���θ�����λ�Ǥ�!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "�ٹ�: ���θ��Ͽ��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾����ͭ�ԤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "�ٹ�: ���θ��Ͽ��ѤǤ��� ����!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "      ���ν�̾�Ϥ����餯 ��ʪ �Ǥ���\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "�ٹ�: ���θ��Ͻ�ʬ�˿��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾����ͭ�ԤΤ�Τ��ɤ����ο��Ǥ��ޤ���\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �����å�: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �����å�: �������Ϥ⤦����ޤ�\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "�桼����ID����ꤷ�Ƥ��ޤ��� (��-r�ɤ�Ȥ��ޤ��礦) ��\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr "������:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5152,168 +5157,168 @@ msgstr ""
 "\n"
 "�桼����ID�����ϡ����Ԥǽ�λ: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "���Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "�����å�: �������ϴ���μ���ͤȤ��Ƥ⤦����ѤߤǤ�\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "�������ϻ��ѶػߤǤ���\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "�����å�: �������Ϥ⤦����ѤߤǤ�\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "����μ���͡�%s�ɤ����Ĥ���ޤ���\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �����å�: �������ϻ��ѶػߤǤ�\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "ͭ���ʰ��褬����ޤ���\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "�ǡ�������¸����Ƥ��ޤ���\n"
 "��¸����ˤϡ�--output�ɥ��ץ�����ȤäƤ�������\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "ʬΥ��̾��\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "�ǡ������ե������̾��������: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "ɸ�����Ϥ���ɽФ��� ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "��̾���줿�ǡ���������ޤ���\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "ƿ̾�μ�����ѤǤ�����̩��%s���ޤ� ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "��λ��ƿ̾�μ�����ѤǤ���\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "�켰��DEK���ϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�Ź楢�르�ꥺ��%d%s��̤�Τ����ѶػߤǤ�\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "�ٹ�: �Ź楢�르�ꥺ��%s�ϼ���ͤ����������äƤ��ޤ���\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "����: ��̩��%s��%s����λ�Ǥ�\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "����: ���ϼ����ѤߤǤ�"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet �˼��Ԥ��ޤ���: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "��%s�ˤϥ桼����ID������ޤ���\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "������:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(����ϡ��ǥꥱ���Ȥʼ������Ǥ�)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "���θ��ˤ��������̾�����������������ޤ���? (y/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII�������Ϥ������ޤ���\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet �˼��Ԥ��ޤ���: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "����������������\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "��%s���Ѥμ����������Ĥ���ޤ���\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "��̩����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "�б����������������ޤ���: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "���θ��ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "̤�Τ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "����: ���θ����ݸ��Ƥ��ޤ���!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5331,243 +5336,227 @@ msgstr ""
 "�������Ǥ����������������դ������������ʤ��Υޥ���ΰ��������ƥ�ϡ�\n"
 "����Ǥ⸫������˥ǡ����򤪤����Ȥ�����ޤ�!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "��������ͳ�����򤷤Ƥ�������:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "����󥻥�"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(�����ǤϤ��֤�%d�����Ӥޤ�)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "ͽ�������������ϡ����Ԥǽ�λ:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "������ͳ: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 msgid "Is this okay? (y/N) "
 msgstr "��������Ǥ���? (y/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "��̩��ʬ�������ޤ���\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "�ݸ�르�ꥺ��%d%s�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "̵���ʥѥ��ե졼���Ǥ��������Ϥ��Ƥ�������"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "�ٹ�: �夤���򸡽Ф��ޤ������ѥ��ե졼�����ѹ����Ƥ���������\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "����뤵�줿16�ӥåȤΥ����å��������̩�����ݸ������\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "�夤�����Ǥ��ޤ��� - �Ƽ¹�\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "�оΰŹ�ˡ�μ夤������򤹤뤳�Ȥ��Ǥ��ޤ���%d���ߤޤ���!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "�ٹ�: ��̾�����󤬡���å�������̷�⤷�ޤ�\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "�ٹ�: ��̾����%s�ϡ���߾����Ǥ���ޤ���\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "�ٹ�: ̵������߾���������̾����%s�ˤ���ޤ�\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "������%s�ϡ���̾��%lu�����Ǥ�\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "������%s�ϡ���̾��%lu�����Ǥ�\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "��%s��%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "��%s��%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "����: ��̾��%s��%s����λ�Ǥ�\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "̤�ΤΥ���ƥ����롦�ӥåȤˤ�ꡢ��%s�ν�̾�������Ȥߤʤ��ޤ�\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "��%s: ����������̾�ˤ�����������������ޤ���\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "��%s: �����б��ؤν�̾�ˤ�����������������ޤ���\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "����ǡ����ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "����ǡ����ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "�ٹ�: ɽ����%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "�ٹ�: �ݥꥷ��URL��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "�ٹ�: �����������С�URL��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s��̾����̾��:��%s��\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϡ�PGP 2.x�����θ���ʬΥ��̾�Ǥ�������Ǥ�\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǥ��ꥢ��̾�����Ǥ��ޤ���\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s�Ź沽����Ѥ��ޤ�\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "���ݤǤ���Ȥ����ե饰�����ˤ����ꤵ��Ƥ��ޤ���\n"
 "��ʪ��������ҤȤϤ��ä���˻Ȥ��ޤ���!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "��%s�ɤ�ȤФ��ޤ�: ��ʣ\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "��%s�ɤ�ȤФ��ޤ�: %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "�����å�: ��̩���Ϥ⤦����ޤ�\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "�����PGP����������Elgamal���ǡ���̾�Ѥˤϰ����ǤϤ���ޤ���!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "���ѥ쥳����%lu, ��%d: ����ߤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5576,348 +5565,348 @@ msgstr ""
 "# Sitei sareta sin'youdo itiran %s\n"
 "# (\"gpg --import-ownertrust\" wo tukatte hukkyuu dekimasu)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "��%s�פǥ��顼: %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "�����󤬤���ޤ���"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "̵���ʻ���"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "��ͭ�Կ����٤�����ޤ���"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "���ѥǡ����١���: Ʊ���˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: ����ߤ˼��Ԥ��ޤ��� (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "���ѥǡ����١����Υȥ�󥶥�������礭�����ޤ�\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �ǥ��쥯�ȥ꡼������ޤ���!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "��%s�פΥ��å�������Ǥ��ޤ���\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "��%s�פ����å��Ǥ��ޤ���\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: �С�����󡦥쥳���ɤκ����˼��Ԥ��ޤ���: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ̵���ʿ��ѥǡ����١��������\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: ���ѥǡ����١������Ǥ��ޤ���\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "����: ���ѥǡ����١��������������ǽ�Ǥ�\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ̵���ʿ��ѥǡ����١���\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤι������顼: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "���ѥǡ����١���: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "���ѥǡ����١���: �ɽФ��˼��Ԥ��ޤ��� (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ���ѥǡ����١������ե�����ǤϤ���ޤ���\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: �쥳�����ֹ�%lu�֤ΥС�����󡦥쥳����\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ̵���ʥե����롦�С������%d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: �����쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �쥳���ɤν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �쥳���ɤ��ɲä˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�ɤ�¹Ԥ��Ƥ���������\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "%dʸ���ʾ��Ĺ���Υƥ����ȹԤϡ���갷���ޤ���\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "���ϹԤ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "��%s�פϡ�ͭ�����緿��ID�Ǥ���ޤ���\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "��%s: ���Ѥ��븰�Ȥ��Ƽ������ޤ���\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "��%s�����ѥǡ����١�����ʣ������ޤ�\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "��%s: ���Ѥ���븰�θ�����������ޤ��� - �ȤФ��ޤ�\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "��%s������Ū�˿��Ѥ���褦��Ͽ���ޤ���\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "���ѥ쥳����%lu, �ꥯ�����ȷ�%d: �ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "���ѥ쥳����%lu���׵ᤵ�줿��%d�ǤϤ���ޤ���\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "̤�Το��ѥ�ǥ� (%d) �ϻȤ��ޤ��� - %s���ѥ�ǥ����\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "%s���ѥ�ǥ�����\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "����"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "��λ"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "̤�Τ�"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 #, fuzzy
 msgid "[marginal]"
 msgstr "��������"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 #, fuzzy
 msgid "[ultimate]"
 msgstr "����Ū"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "̤���"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "̵����"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "��������"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "����"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "����Ū"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "����ο��ѥǡ����١��������ϡ�%s�Ǥ�\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "���ѥ�ǥ��%s�פǿ��ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "���ѥ�ǥ��%s�פǿ��ѥǡ����١����ι����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "������%s�����Ĥ���ޤ���: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "--check-trustdb��¹Ԥ��Ƥ�������\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "���ѥǡ����١����θ���\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d�ܤθ������ (����%d�ܤ�ͭ�������򥯥ꥢ)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "����Ū�˿��Ѥ��븰�����Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "����Ū�˿��Ѥ��븰%s�θ����������Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "�Ǿ��Ρ֤������٤ο��ѡ�%d���Ǿ��Ρ�����Ū���ѡ�%d��%s���ѥ�ǥ�\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "����: %d  ͭ����: %3d  ��̾: %3d  ����: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "���ѥǡ����١����ΥС�����󡦥쥳���ɤ������Ǥ��ޤ���: ����ߤ˼��Ԥ��ޤ�"
 "��: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5932,306 +5921,318 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "���Ϥ�%u���ܤ�Ĺ�����뤫��LF���ʤ��褦�Ǥ�\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "����Ū�ʥ��顼"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "̤�ΤΥѥ��åȷ��Ǥ�"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "̤�ΤΥС������Ǥ�"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "̤�Τθ��������르�ꥺ��Ǥ�"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "̤�Τ����󥢥르�ꥺ��Ǥ�"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "�������������Ǥ�"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "��̩���������Ǥ�"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "��̾�������Ǥ�"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "�����å����ࡦ���顼"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "�����������Ĥ���ޤ���"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "̤�ΤΰŹ楢�르�ꥺ��Ǥ�"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "���ؤ������ޤ���"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "̵���ʥѥ��åȤǤ�"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "̵���������Ǥ�"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "���Υ桼����ID�Ϥ���ޤ���"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "��̩���������ޤ���"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "���ä���̩�����Ȥ��Ƥ��ޤ�"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "���ݡ��Ȥ��Ƥ��ޤ���"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "���������Ǥ�"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "�ե�������ɽФ����顼"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "�ե�����ν���ߥ��顼"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "̤�Τΰ��̥��르�ꥺ��Ǥ�"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "�ե�����Υ����ץ󡦥��顼"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "�ե�����κ������顼"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "�ѥ��ե졼����̵���Ǥ�"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "̤�����θ��������르�ꥺ��Ǥ�"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "̤�����ΰŹ楢�르�ꥺ��Ǥ�"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "̤�Τν�̾���饹�Ǥ�"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "���ѥǡ����١����Υ��顼�Ǥ�"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "������MPI�Ǥ�"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "�꥽�������³��Ǥ�"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "̵���ʸ��ؤǤ�"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "�����ʾ�����Ǥ�"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "�桼����ID�ν񼰤�����������ޤ���"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "�ե�����Υ������������顼"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "�ե�����̾���ѹ����顼"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "�ե�����κ�����顼"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "ͽ�����̥ǡ����Ǥ�"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "������̷�⤷�Ƥ��ޤ�"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "���ѤǤ��ʤ����������르�ꥺ��Ǥ�"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "�ե����뤬¸�ߤ��Ƥ��ޤ�"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "�夤���Ǥ�"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "̵���ʻ���Ǥ�"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "URI�������Ǥ�"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "����URI�ϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "�ͥåȥ�������顼"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "�Ź沽����Ƥ��ޤ���"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "̤����"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "���ѤǤ��ʤ��������Ǥ�"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "���ѤǤ��ʤ���̩���Ǥ�"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "�������С��Υ��顼"
 
-#: util/errors.c:109
+#: util/errors.c:107
 msgid "canceled"
 msgstr "����󥻥�"
 
-#: util/errors.c:110
+#: util/errors.c:108
 msgid "no card"
 msgstr "�����ɤ�����ޤ���"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "��̾���줿�ǡ���������ޤ���\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr "���顼: "
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr "�ٹ�: "
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�Х���ȯ�� ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr "okay|okay"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr "cancel|cancel"
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "�ٹ�: ���ݤʥ��꡼����Ѥ��Ƥ��ޤ�!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "������Ѥߤΰ����ʥ��꡼���ʤ����ˤ����Ǥ��ޤ���\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(������Ū�ˤϸ��ä��ץ�������Ȥä��ΤǤ��礦)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "����ǡ����ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr "����ǡ����ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA�Ǥ�160�ӥåȤΥϥå��塦���르�ꥺ��λ��Ѥ�ɬ�פǤ�\n"
 
diff --git a/po/nb.po b/po/nb.po
index 6a5525bb1..d69434c50 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -18,90 +18,90 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "kan ikke generere et primtall med pbits=%u qbits=%u\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "kan ikke generere et primtall med mindre enn %d bit\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "ingen entropy-innsamlingsmodul ble oppdaget\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "kan ikke l�se �%s�: %s\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "venter p� l�sing av �%s� ...\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan ikke stat() �%s�: %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "�%s� er ikke en vanlig fil - ignorert\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "merk: random_seed-fila er tom\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "ADVARSEL: ugyldig st�rrelse p� random_seed-fila - ikke brukt\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan ikke lese �%s�: %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "merk: random_seed-fila ble ikke oppdatert\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan ikke skrive �%s�: %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan ikke lukke �%s�: %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ADVARSEL: bruke usikker tilfeldig-tall-generator!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -114,7 +114,7 @@ msgstr ""
 "\n"
 "IKKE BRUK NOE DATA GENERERT AV DETTE PROGRAMMET!!\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -124,7 +124,7 @@ msgstr ""
 "hindrer deg fra � kjede deg, fordi arbeidet vil forbedre kvaliteten p�\n"
 "entropyen.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -136,62 +136,62 @@ msgstr ""
 "arbeid for � gi operativsystemet en sjanse til � samle mer entropy!\n"
 "(Trenger %d flere byter)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "klarte ikke � lagre opprettelsesdatoen: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr "respons inneholder ikke data om offentlig n�kkel\n"
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr "respons inneholder ikke RSA-modulus\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-callback returnerte en feil: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "bekreftelse av CHV%d mislyktes: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr "feil ved henting av CHV-status fra kort\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr "kort er permanent l�st!\n"
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d Admin PIN-fors�k f�r kortet blir l�st permanent\n"
@@ -199,343 +199,348 @@ msgstr "%d Admin PIN-fors�k f�r kortet blir l�st permanent\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN"
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN"
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "feil ved henting av ny PIN: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 msgid "error reading application data\n"
 msgstr "feil ved lesing av applikasjonsdata\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 msgid "error reading fingerprint DO\n"
 msgstr "feil ved lesing av fingeravtrykk DO\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 msgid "key already exists\n"
 msgstr "n�kkel finnes allerede\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr "eksisterende n�kkel vil bli erstattet\n"
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 msgid "generating new key\n"
 msgstr "generere en ny n�kkel\n"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr "tidsstempel for opprettelse mangler\n"
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA-modulus mangler eller har ikke en st�rrelse p� %d bits\n"
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "offentlig RSA-eksponent mangler eller er st�rre enn %d bits\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA-primtall %s mangler eller har ikke en st�rrelse p� %d bits\n"
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr "vennligst vent mens n�kkel blir generert ...\n"
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 msgid "generating key failed\n"
 msgstr "n�kkelgenerering mislyktes\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "n�kkelgenerering fullf�rt (%d sekunder)\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet st�tter ikke digestalgoritme %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer opprettet s� langt: %lu\n"
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "bekrefting av Admin PIN er forel�pig nektet gjennom denne kommandoen\n"
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "ugyldig armorheader: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "armorheader: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "ugyldig clearsigheader\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "armorheader: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "n�stede klartekstsignaturer\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 msgid "unexpected armor: "
 msgstr "uforventet armering:"
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "ugyldig bindestrekbeskyttet linje: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "hoppet over ugyldig radix64-tegn %02x\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "for tidlig eof (ingen CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "for tidlig eof (i CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "misdannet CRC\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-feil; %06lX - %06lX\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 msgid "premature eof (in trailer)\n"
 msgstr "for tidlig eof (i trailer)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "feil i trailerlinje\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP-data funnet.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldig armor: linje lengre enn %d tegn\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted printable-tegn i armor - antakelig har en MTA med feil blitt brukt\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kortnummer %s oppdaget\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "kan ikke gj�re dette i batchmodus\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Ditt valg? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr "[ikke satt]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 msgid "male"
 msgstr "mann"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "female"
 msgstr "dame"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "unspecified"
 msgstr "uspesifisert"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "not forced"
 msgstr "ikke tvunget"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Feil: Bare ren ASCII er forel�pig tillatt.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Feil: Tegnet �<� kan ikke brukes.\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr "Kortholders etternavn: "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Feil: Det kombinerte navnet er for langt (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 msgid "URL to retrieve public key: "
 msgstr "URL for � hente offentlig n�kkel: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Feil: URL er for lang (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr "Logindata (kontonavn): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Feil: Logindata er for langt (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Feil: Privat DO for lang (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 msgid "Language preferences: "
 msgstr "Spr�kpreferanser:"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 msgid "Error: invalid length of preference string.\n"
 msgstr "Feil: ugyldig lengde p� preferansestrengen.\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Feil: ugyldig tegn i preferansestrengen.\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Kj�nn ((M)ale, (F)emale eller mellomrom): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 msgid "Error: invalid response.\n"
 msgstr "Feil: ugyldig respons.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtrykk: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "n�kkeloperasjonen er umulig: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr "Erstatte eksisterende n�kkel? (j/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Lage sikkerhetskopi av krypteringsn�kler utenfor kortet? (J/n) "
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr "Erstatte eksisterende n�kler? (j/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -546,140 +551,140 @@ msgstr ""
 "   PIN = �%s�     Admin PIN = �%s�\n"
 "Du b�r endre dem med kommandoen --change-pin\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 msgid "Please select the type of key to generate:\n"
 msgstr "Vennligst velg hvilken type n�kkel du vil generere:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signaturn�kkel\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsn�kkel\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsn�kkel\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Ugyldig valg.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 msgid "Please select where to store the key:\n"
 msgstr "Vennligst velg hvor n�kkelen skal lagres:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 msgid "unknown key protection algorithm\n"
 msgstr "ukjent n�kkelbeskyttelsesalgoritme\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 msgid "secret parts of key are not available\n"
 msgstr "hemmelige deler av n�kkelen er ikke tilgjengelig.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 msgid "secret key already stored on a card\n"
 msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "avslutte denne menyen"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "show admin commands"
 msgstr "vise admin-kommandoer"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "vise denne hjelpen"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "list all available data"
 msgstr "vis alle tilgjengelige data"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr "endre kortholders navn"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr "endre URL for � hente n�kkel"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr "hente n�kkelen angitt i URL som er lagret i kortet"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change the login name"
 msgstr "endre loginnavnet"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "change the language preferences"
 msgstr "endre spr�kpreferansene"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr "endre kortholders kj�nn"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "change a CA fingerprint"
 msgstr "vise et CA-fingeravtrykk"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr "veksle tving-signatur-PIN-flagget"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 msgid "generate new keys"
 msgstr "generere nye n�kler"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr "meny for � endre eller fjerne blokkering av PIN"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr "bekrefte PIN og vise alle data"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 msgid "Admin-only command\n"
 msgstr "Admin-reservert kommando\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 msgid "Admin commands are allowed\n"
 msgstr "Admin-kommandoer er tillatt\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando  (pr�v �help�)\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "hemmelig n�kkel er ikke tilgjengelig"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 "Vennligst sett inn kortet og trykk p� enter eller tast inn �c� for � "
 "avbryte: "
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "sleting av n�kkelblokk mislyktes: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -688,132 +693,132 @@ msgstr ""
 "Vennligst fjern det n�v�rende kortet og sett inn kortet med serienummeret:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Trykk p� enter n�r du er klar eller tast �c� for � avbryte: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr "Tast inn ny Admin-PIN: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr "Tast inn ny PIN: "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr "Tast inn Admin-PIN: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr "Tast inn PIN: "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 msgid "Repeat this PIN: "
 msgstr "Gjenta denne PIN: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN ble ikke gjentatt korrekt; pr�v igjen"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �pne �%s�\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommandoen\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "feil ved lesing av n�kkelblokk: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(med mindre du angir n�kkelen ved hjelp av fingeravtrykk)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "kan ikke gj�re dette i batchmode uten �--yes�\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Slette denne n�kkelen fra n�kkelknippet? (j/N)"
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Dette er en hemmelig n�kkel! - virkelig slette den? (j/N)"
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "sleting av n�kkelblokk mislyktes: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "nullstilt informasjon om eiertillit\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "det finnes en hemmelig n�kkel for offentlig n�kkel �%s�!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "bruk valget �--delete-secret-keys� for � slette den f�rst.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "kan ikke bruke en symmetrisk ESK-pakke p� grunn av S2K-modusen\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "bruker cipher %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "�%s� er allerede komprimert\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: �%s� er en tom fil\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "du kan bare kryptere med RSA-n�kler med lengder p� 2048 bits eller mindre i "
 "--pgp2-modus\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leser fra �%s�\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "klarte ikke � bruke IDEA-algoritmen for alle n�klene du krypterer til.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -821,7 +826,7 @@ msgstr ""
 "ADVARSEL: p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -830,164 +835,164 @@ msgstr ""
 "ADVARSEL: tvang av kompresjonsalgoritme %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens preferanser\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "du kan ikke bruke %s i %s modus\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kryptert for: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterte data\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kryptert med en ukjent algoritme %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ADVARSEL: meldingen er kryptert med en svak n�kkel for den symmetriske "
 "cipher.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "problem ved h�ndtering av kryptert pakke\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "fjernutf�ring av programmer er ikke st�ttet\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "eksterne programkall er utkoblet p� grunn av utrygge rettigheter p� "
 "konfigurasjonsfila\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "denne plattformen krever midlertidige filer ved kall p� eksterne programmer\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "kunne ikke utf�re program �%s�: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "kunne ikke utf�re skallet �%s�: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "systemfeil under kall p� eksternt program: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "unaturlig avslutning av eksternt program\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "klarte ikke � kj�re eksternt program\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "klarte ikke � lese reponsen fra eksternt program: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "ADVARSEL: klarte ikke � fjerne midlertidig fil (%s) �%s�: %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ADVARSEL: klarte ikke � fjerne midlertidig katalog �%s�: %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 msgid "export signatures that are marked as local-only"
 msgstr "eksportere signaturer som er markert som bare-lokale"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 msgid "remove the passphrase from exported subkeys"
 msgstr ""
 
-#: g10/export.c:69
+#: g10/export.c:67
 msgid "remove unusable parts from key during export"
 msgstr ""
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 msgid "exporting secret keys not allowed\n"
 msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "n�kkel %s: ikke beskyttet - hoppet over\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "n�kkel %s: PGP 2.x-aktig n�kkel - hoppet over\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "n�kkel %s: n�kkelmateriell p� kort - hoppet over\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "klarte ikke � fjerne beskyttelsen p� undern�kkelen: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ADVARSEL: hemmelig n�kkel %s har ikke en enkel SK-sjekksum\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: ingenting eksportert\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -995,127 +1000,127 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[fil]|lage en signatur"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|lage en klartekstsignatur"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "lage en adskilt signatur"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "kryptere data"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering med bare symmetrisk cipher"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "dekryptere data (standard)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "bekrefte en signatur"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "liste n�kler"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "liste n�kler og signaturer"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "list and check key signatures"
 msgstr "vise og sjekke n�kkelsignaturer"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "liste n�kler og fingeravtrykk"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "liste hemmelige n�kler"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "generere et nytt n�kkelpar"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "fjerne n�kler fra det hemmelige n�kkelknippet"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "signere en n�kkel"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "signere en n�kkel lokalt"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "signere eller redigere en n�kkel"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "generere et opphevingssertifikat"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "eksportere n�kler"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "eksportere n�kler til en n�kkelserver"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "importere n�kler fra en n�kkelserver"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "s�ke etter n�kler p� en n�kkelserver"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "oppdatere alle n�klene fra en n�kkelserver"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "importere/flette n�kler"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr "vis kortets status"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr "endre data p� et kort"
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr "endre PIN p� et kort"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "oppdatere tillitsdatabasen"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skrive meldingsdigester"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1125,51 +1130,51 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "lage ASCII-beskyttet output"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "bruke denne brukeriden for signering eller dekryptering"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sette kompresjonsniv� til N (0 sl�r av kompresjon)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "bruk som outputfil"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "fyldig output"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "ikke gj�r noen endringer"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "sp�r f�r overskriving"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr "bruk streng OpenPGP-oppf�rsel"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr "generere PGP 2.x-kompatible meldinger"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1177,7 +1182,7 @@ msgstr ""
 "@\n"
 "(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1197,15 +1202,15 @@ msgstr ""
 " --list-keys [navn]         vise n�kler\n"
 " --fingerprint [navn]       vise fingeravtrykk\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Vennligst rapporter feil til <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1215,7 +1220,7 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1223,73 +1228,73 @@ msgstr ""
 "\n"
 "St�ttede algoritmer:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "Offentlig n�kkel: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Kompresjon: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "fant ingen �=�-tegn i gruppedefinisjonen �%s�\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over hjemmekatalogen �%"
 "s�\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1297,20 +1302,20 @@ msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over konfigurasjonsfilen "
 "�%s�\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over utvidelsen �%s�\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over hjemmekatalogen "
 "�%s�\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1318,538 +1323,538 @@ msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over "
 "konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over utvidelsen �%s�\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 msgid "show the keyring name in key listings"
 msgstr "vise navnet til n�kkelknippene i n�kkellister"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil �%s�\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MERK: %s er ikke for vanlig bruk!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "cipherutvidelse �%s� ble ikke lastet p� grunn av utrygge rettigheter\n"
 
 # Tenk litt p� denne du, Trond.
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�%s� er ikke en gyldig signaturutg�else\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�%s� er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 msgid "invalid keyserver options\n"
 msgstr "ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importvalg\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "ugyldige importvalg\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 msgid "invalid verify options\n"
 msgstr "ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke sette exec-path til %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er ikke fornuftig med %s!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr ""
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "du kan bare lage adskilte eller klare signaturer i --pgp2-modus\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan ikke signere og kryptere samtidig i --pgp2-modus\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du m� bruke filer (og ikke en pipe) n�r --pgp2 er p�sl�tt\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering en melding i --pgp2-modus krever IDEA-algoritmen\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt kompresjonsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m� v�re st�rre enn 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neede m� v�re st�rre enn 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth m� v�re i intervallet fra 1 til 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig default-cert-level; m� v�re 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig min-cert-level; m� v�re 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K-modus; m� v�re 0, 1 eller 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "ugyldig standard preferanser\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig cipherpreferanser\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig digestpreferanser\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig kompresjonspreferanser\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enn� med %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke cipheralgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke digestalgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke kompresjonsalgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ADVARSEL: mottakere (-r) angitt uten � bruke offentlig n�kkelkryptering\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmtric --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmetric --sign --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key brukerid"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key brukerid [kommandoer]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [brukerid] [n�kkelknippe]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "n�kkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "s�k p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Sett i gang og tast inn meldingen din ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "for mange innslag i pk-cachen - utkoblet\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 msgid "[User ID not found]"
 msgstr "[Brukerid ikke funnet]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ugyldig n�kkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemmelig undern�kkel for offentlig undern�kkel %s - ignorerer\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruker undern�kkel %s i stedet for prim�rn�kkel %s\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�kkel %s: hemmelig n�kkel uten offentlig n�kkel - hoppet over\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "v�re noenlunde stille"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "hent n�klene fra dette n�kkelknippet"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "la konflikter mellom tidsstempler bare v�re en advarsel"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skrive statusinfo til denne FD"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpgv [valg] [filer] (-h for hjelp)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1857,14 +1862,14 @@ msgstr ""
 "Bruksm�te: gpgv [valg] [filer]\n"
 "Sjekke signaturer mot kjente betrodde n�kler\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1872,16 +1877,16 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1895,23 +1900,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr ""
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr ""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1919,19 +1924,19 @@ msgid ""
 "the given value as an interval."
 msgstr ""
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr ""
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr ""
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1940,11 +1945,11 @@ msgid ""
 "Q  to to quit the key generation."
 msgstr ""
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2012,28 +2017,28 @@ msgstr ""
 "\n"
 "Svar �0� dersom du ikke vet hva det riktige svaret er."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2041,13 +2046,13 @@ msgid ""
 "a trust connection through another already certified key."
 msgstr ""
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2056,36 +2061,36 @@ msgid ""
 "a second one is available."
 msgstr ""
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr ""
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2101,533 +2106,533 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr ""
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr ""
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 msgid "do not update the trustdb after import"
 msgstr "ikke oppdat�r tillitsdatabasen etter import"
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr ""
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 msgid "remove unusable parts from key after import"
 msgstr ""
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hopper over blokk av typen %d\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu n�kler behandlet hittil\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antall behandlet: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "nye n�kler som ble hoppet over: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "               uten brukerider: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "                     importert: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                       uendret: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                nye brukerider: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               nye undern�kler: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                nye signaturer: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         nye n�kkelopphevinger: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "        leste hemmelige n�kler: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "   importerte hemmelige n�kler: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  uforandrede hemmelige n�kler: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                ikke importert: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         oppryddete signaturer: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "         oppryddete brukerider: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "                nye brukerider: %lu\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         �%s� preferanse for digestalgoritme %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "n�kkel %s: ingen brukerid\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "n�kkel %s: PKS-undern�kkel reparert\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "n�kkel %s: akseptert ikke-selvsignert brukerid �%s�\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "n�kkel %s: ingen gyldig brukerid\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dette kan skyldes en manglende selvsignatur\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "n�kkel %s: offentlig n�kkel ikke funnet: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "n�kkel %s: ny n�kkel - hoppet over\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ingen skrivbart n�kkelknippe funnet: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til �%s�\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "n�kkel %s: offentlig n�kkel �%s� importert\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "n�kkel %s: stemmer ikke med v�r kopi\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "n�kkel %s: kan ikke finne original n�kkelblokk: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "n�kkel %s: kan ikke lese original n�kkelblokk: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "n�kkel %s: �%s� 1 ny brukerid\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "n�kkel %s: �%s� %d nye brukerider\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "n�kkel %s: �%s� 1 ny signatur\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "n�kkel %s: �%s� 1 ny undern�kkel\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "n�kkel %s: �%s� %d nye undern�kler\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "n�kkel %s: �%s� %d nye brukerider\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "n�kkel %s: �%s� %d nye brukerider\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "n�kkel %s: �%s� ikke endret\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "n�kkel %s: hemmelig n�kkel med ugyldig cipher %d - hoppet over\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "import av hemmelig n�kkel er ikke tillatt\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard hemmelig n�kkelknippe: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "n�kkel %s: hemmelig n�kkel importert\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "n�kkel %s: finnes allerede i hemmelig n�kkelknippe\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "n�kkel %s: hemmelig n�kkel ikke funnet: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "n�kkel %s: ingen offentlig n�kkel - kan ikke anvende opphevingssertifikat\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "n�kkel %s: �%s� opphevingssertifikat importert\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "n�kkel %s: ingen brukerid for signatur\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme for brukerid �%s�\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "n�kkel %s: ugyldig selvsignatur for brukerid �%s�\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "n�kkel %s: ingen undern�kkel for n�kkelbinding\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "n�kkel %s: ugyldig undern�kkelbinding\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "n�kkel %s: fjernet flere undern�kkelbindinger\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "n�kkel %s: ingen undern�kkel for n�kkeloppheving\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "n�kkel %s: ugyldig undern�kkeloppheving\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "n�kkel %s: fjernet flere undern�kkelopphevinger\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "n�kkel %s: hoppet over brukerid �%s�\n"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "n�kkel %s: hoppet over undern�kkel\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "n�kkel %s: ikke-eksporterbar signatur (klasse 0x%02X) - hoppet over\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "n�kkel %s: opphevingssertifikat p� feil plass - hoppet over\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "n�kkel %s: undern�kkelsignatur p� feil plass - hoppet over\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "n�kkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "n�kkel %s: duplikert brukerid oppdaget - flettet sammen\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: n�kkel %s kan v�re opphevet: henter opphevingsn�kkel %s\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ADVARSEL: n�kkel %s kan v�re opphevet: opphevingsn�kkel %s ikke tilstede.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�kkel %s: �%s� opphevingssertifikat lagt til\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr ""
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr ""
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "n�kkelknippet �%s� ble opprettet\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "n�kkelblokkressurs �%s�: %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[oppheving]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[selvsignatur]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 ubrukelig signatur\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ubrukelige signaturer\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur ble ikke sjekket p� grunn av en manglende n�kkel\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer ble ikke sjekket p� grunn av manglende n�kler\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur ble ikke sjekket p� grunn av en feil\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer ble ikke sjekket p� grunn av feil\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 brukerid uten gyldig selvsignatur ble oppdaget\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d brukerider uten gyldige selvsignaturer ble oppdaget\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2638,62 +2643,62 @@ msgstr ""
 "andre brukeres n�kler (ved � se p� pass, sjekke fingeravtrykk fra\n"
 "forskjellige kilder, osv.)\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = Jeg stoler marginalt\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = Jeg stoler fullt\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Brukerid �%s� er opphevet."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du fortsatt sikker p� at du vil signerere den? (j/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  Kunne ikke signere.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Brukerid �%s� er utg�tt."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Brukeriden �%s� er ikke selvsignert."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Brukeriden �%s� er signerbar."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "Signere den? (j/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2702,11 +2707,11 @@ msgstr ""
 "Selvsignaturen p� �%s�\n"
 "er en PGP 2.x-aktig signatur.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vil du forfremme den til en OpenPGP-selvsignatur? (j/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2715,11 +2720,11 @@ msgstr ""
 "Din n�v�rende signatur p� �%s�\n"
 "er utg�tt.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Vil du utstede en ny signatur for � erstatte den som er utg�tt? (j/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2728,54 +2733,54 @@ msgstr ""
 "Din n�v�rede signatur p� �%s�\n"
 "er en lokal signatur.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vil du forfremme den til en fullt eksporterbar signatur? (j/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "�%s� var allerede lokalt signert av n�kkelen %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "�%s� var allerede signert av n�kkelen %s\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Vil du likevel signere den igjen? (j/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Ingenting � signere med n�kkelen %s\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Denne n�kkelen er utg�tt!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne n�kkelen utg�r den %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Vil du at signaturen skal utg� p� samme tidspunkt? (J/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Du kan ikke lage en OpenPGP-signatur p� en PGP-2.x-n�kkel i --pgp2-modus.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Dette ville gj�re n�kkelen ubrukelig i PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2785,31 +2790,31 @@ msgstr ""
 "tilh�rer den overnevnte personen?  Tast inn �0� dersom du ikke vet\n"
 "svaret.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Jeg vil ikke svare.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Jeg har ikke sjekket i det hele tatt.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Jeg har gjort en vanlig sjekk.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Jeg har sjekket veldig n�ye.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ditt valg? (angi �?� for mer informasjon): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2818,267 +2823,267 @@ msgstr ""
 "Er du virkelig sikker p� at du vil signerere denne n�kkelen med din\n"
 "n�kkel �%s� (%s)\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 msgid "This will be a self-signature.\n"
 msgstr "Dette vil v�re en selvsignatur.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ADVARSEL: signaturen vil ikke bli markert som ikke-eksporterbar.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "ADVARSEL: signaturen vil ikke bli markert som ikke-opphevbar.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Signaturen vil bli markert som ikke-eksporterbar.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Signaturen vil bli markert som ikke-opphevbar.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "I have not checked this key at all.\n"
 msgstr "Jeg har ikke sjekket denne n�kkelen i det hele tatt.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 msgid "I have checked this key casually.\n"
 msgstr "Jeg har sjekket denne n�kkelen p� vanlig m�te.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 msgid "I have checked this key very carefully.\n"
 msgstr "Jeg har sjekket denne n�kkelen veldig n�ye.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 msgid "Really sign? (y/N) "
 msgstr "Virkelig signere? (j/N) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering mislyktes: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Denne n�kkelen er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Hemmelige deler av prim�rn�kkelen er ikke tilgjengelig.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemmelige deler av prim�rn�kkelen er lagret p� kort.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "N�kkelen er beskyttet.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�kkelen: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Tast inn den nye passfrasen for denne hemmelige n�kklen.\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "passfrasen ble ikke gjentatt korrekt; pr�v igjen"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "Du �nsker ikke en passfrase - dette er sannsynligvis en *dum* id�!\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vil du virkelig gj�re dette? (j/N) "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "flytter en n�kkelsignatur til den rette plassen\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "lagre og avslutte"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "vise n�kkelens fingeravtrykk"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "liste n�kler og brukerider"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "velger brukerid N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "velger brukerid N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "sjekke signaturer"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs locally"
 msgstr "signerere utvalgte brukerider lokalt"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a trust signature"
 msgstr "signere utvalgte brukerider med en tillitssignatur"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "legge til en brukerid"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "legge til en fotoid"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 msgid "delete selected user IDs"
 msgstr "slette utvalgte brukerider"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "add a subkey"
 msgstr "legge til en undern�kkel"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 msgid "delete selected subkeys"
 msgstr "slette utvalgte undern�kler"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "legge til en opphevingsn�kkel"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 msgid "delete signatures from the selected user IDs"
 msgstr "slette signaturene fra de utvalgte brukeridene"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 msgid "flag the selected user ID as primary"
 msgstr "markere den valgte brukeriden som den prim�re"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 msgid "toggle between the secret and public key listings"
 msgstr "veksle mellom hemmelig og offentlig n�kkellisting"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "liste preferanser (ekspert)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "liste preferanser (fyldig)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "set preference list for the selected user IDs"
 msgstr "sette preferanseliste for de valgte brukeridene"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "sette URL for foretrukket n�kkelserver for de valgte brukeridene"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 msgid "set a notation for the selected user IDs"
 msgstr "sette en notasjon for de valgte brukeridene"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "endre passfrasen"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "endre eiertilliten"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 msgid "revoke signatures on the selected user IDs"
 msgstr "oppheve signaturene p� de valgte brukeridene"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 msgid "revoke selected user IDs"
 msgstr "oppheve utvalgte brukerider"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "revoke key or selected subkeys"
 msgstr "oppheve n�kkel eller utvalgte undern�kler"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 msgid "enable key"
 msgstr "innkoble en n�kkel"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 msgid "disable key"
 msgstr "utkoble en n�kkel"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 msgid "show selected photo IDs"
 msgstr "vise utvalgte fotoider"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "feil ved lesing av hemmelig n�kkelblokk �%s�: %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Hemmelig n�kkel er tilgjengelig\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Vennligst bruk kommandoen �toggle� f�rst.\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3086,569 +3091,569 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "N�kkelen er opphevet."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Virkelig signerere alle brukerider? (j/N) "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Velg brukeriden som skal signeres\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Ukjent signaturtype �%s�\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Du m� velge minst en brukerid.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan ikke slette den siste brukeriden!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Virkelig fjerne alle valgte brukerider? (j/N) "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 msgid "Really remove this user ID? (y/N) "
 msgstr "Virkelig fjerne denne brukeriden? (j/N) "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 msgid "Really move the primary key? (y/N) "
 msgstr "Virkelig flytte prim�rn�kkelen? (j/N) "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 msgid "You must select exactly one key.\n"
 msgstr "Du m� velge minst en n�kkel.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Kan ikke �pne �%s�: %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Feil ved lesing av sikkerhetskopiert n�kkel �%s�: %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Du m� velge minst en n�kkel.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig slette denne n�kkelen? (j/N) "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Virkelig oppheve alle de valgte brukeridene? (j/N) "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Virkelig oppheve denne brukeriden? (j/N) "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vil du virkelig oppheve hele n�kkelen? (j/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vil du virkelig oppheve de valgte undern�klene? (j/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig oppheve denne undern�kkelen? (j/N) "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 msgid "Set preference list to:\n"
 msgstr "sette preferanseliste til:\n"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Virkelig oppdatere preferansene for de valgte brukeridene? (j/N) "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 msgid "Really update the preferences? (y/N) "
 msgstr "Virkelig oppdatere preferansene? (j/N) "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 msgid "Save changes? (y/N) "
 msgstr "Lagre endringene? (j/N) "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 msgid "Quit without saving? (y/N) "
 msgstr "Avslutte uten � lagre? (j/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "N�kkelen ble ikke endret, s� ingen oppdatering er n�dvendig.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "S�rtrekk: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 msgid "Notations: "
 msgstr "Notasjoner: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Det er ingen preferanser for en PGP 2.x-aktig brukerid.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Denne n�kkelen ble opphevet den %s av %s med n�kkelen %s\n"
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denne n�kkelen kan bli opphevet av %s med n�kkelen %s"
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, c-format
 msgid "created: %s"
 msgstr "opprettet: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, c-format
 msgid "revoked: %s"
 msgstr "opphevet: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "utgikk: %s"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, c-format
 msgid "expires: %s"
 msgstr "utg�r: %s"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, c-format
 msgid "usage: %s"
 msgstr "bruksm�te: %s"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr "gyldighet: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Denne n�kkelen har blitt utkoblet"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "opphevet"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "utg�tt"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker p� at du vil legge den til? (j/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slette denne gode signaturen? (j/N/a)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettet %d signatur.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Slettet %d signaturer.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Ingen ble slettet.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Er du fortsatt sikker p� at du vil gj�re denne n�kkelen til en opphever? (j/"
 "N) "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 msgid "Please select at most one subkey.\n"
 msgstr "Vennligst velg minst en undern�kkel.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hopper over v3 selvsignatur for brukerid �%s�\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker p� at du vil erstatte den? (j/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker p� at du vil slette den? (j/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 msgid "Proceed? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (ikke-eksporterbar)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne signaturen utgikk den %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 msgid " (non-revocable)"
 msgstr " (ikke-opphevbar)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "ingen hemmelig n�kkel\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "brukerid �%s� er allerede opphevet\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ADVARSEL: en brukeridsignatur er datert %d sekunder i fremtiden\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�kkelen %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferansen %s er duplisert\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "for mange cipher-preferanser\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "for mange digest-preferanser\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "for mange kompresjons-preferanser\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "ugyldig oppf�ring �%s� i preferansestreng\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "skriver direkte signatur\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "skriver n�kkelbindende signatur\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "n�kkelst�rrelsen er ugyldig; bruker %u bits\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "n�kkelst�rrelsen ble rundet opp til %u bits\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 msgid "Sign"
 msgstr "Signere"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr "Bekrefte"
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 msgid "Encrypt"
 msgstr "Kryptere data"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr "Autentisere"
 
@@ -3656,109 +3661,109 @@ msgstr "Autentisere"
 # K og k for kryptering
 # A og a for autentisering
 # Q og q for avslutte
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Vennligst velg hvilken type n�kkel du vil ha:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (bare signering)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (bare kryptering)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (bare signering)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (bare kryptering)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-n�kkelpar vil ha %u bits.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�kkelst�rrelse er %u bits\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet opp til %u bits\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3774,7 +3779,7 @@ msgstr ""
 "      <n>m = n�kkelen utg�r om n months\n"
 "      <n>y = n�kkelen utg�r om n years\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3790,38 +3795,38 @@ msgstr ""
 "      <n>m = signaturen utg�r om n months\n"
 "      <n>y = signaturen utg�r om n years\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "N�kkelen er gyldig for? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen er gyldig for? (%s) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "ugyldig verdi\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 msgid "Key does not expire at all\n"
 msgstr "N�kkel utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "N�kkel utg�r den %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen utg�r den %s\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3829,11 +3834,11 @@ msgstr ""
 "Systemet ditt kan ikke vise datoer etter 2038.\n"
 "Likevel vil det bli h�ndtert korrekt opp til 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/N)? "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3849,44 +3854,44 @@ msgstr ""
 "    �Heinrich Heine (Der Dichter) <[email protected]>�\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Fullt navn: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Ugyldig tegn i navn\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "Navnet kan ikke starte med et siffer\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navnet m� v�re minst 5 tegn langt\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Ugyldig tegn i kommentar\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruker tegnsettet �%s�.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3897,7 +3902,7 @@ msgstr ""
 "    �%s�\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Vennligst ikke putt epostadressen inn i fullt navn eller i kommentaren\n"
@@ -3913,23 +3918,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnKeEeRrAa"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Vennligst korriger feilen f�rst\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3937,12 +3942,12 @@ msgstr ""
 "Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -3954,7 +3959,7 @@ msgstr ""
 "hjelp av dette programmet og valget �--edit-key�.\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3966,50 +3971,50 @@ msgstr ""
 "diskene jobbe) under primtallgenereringen; dette gir\n"
 "tilfeldig-tall-generatoren en bedre sjanse til � samle nok entropy.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "N�kkelgenereringen ble avbrutt.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentlig n�kkel til �%s�\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver forel�pig hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbart offentlig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "ingen skrivbart hemmelig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "feil ved skriving av offentlig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�kkel opprettet og signert.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4018,13 +4023,13 @@ msgstr ""
 "kanskje � bruke kommandoen �--edit-key� for � generere en\n"
 "sekund�rn�kkel for dette form�let.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "N�kkelgenerering mislyktes: %s\n"
 
 # Er dette entallsformen av denne strengen?
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4033,7 +4038,7 @@ msgstr ""
 "klokkeproblem)\n"
 
 # Er dette flertallsformen av denne og den forrige strengen?
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4041,682 +4046,682 @@ msgstr ""
 "n�kkel har blitt opprettet %lu sekunder i fremtiden (time warp eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "MERK: opprettelse av undern�kler for v3-n�kler er ikke i samsvar med "
 "OpenPGP\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 msgid "Really create? (y/N) "
 msgstr "Virkelig opprette? (j/N)"
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "lagring av n�kkel p� kort mislyktes: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr ""
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr ""
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr ""
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr ""
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "N�kkelknippe"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Fingeravtrykk for prim�rn�kkel:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "     Fingeravtrykk for undern�kkel:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr " Fingeravtrykk for prim�rn�kkel:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "      Fingeravstrykk for undern�kkel:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 msgid "      Key fingerprint ="
 msgstr " N�kkelfingeravtrykk ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr "      Serienummer for kort ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ADVARSEL: 2 filer med konfidensiell informasjon finnes.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "cacher n�kkelknippet �%s�\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu n�kler cachet s� langt (%lu signaturer)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu n�kler cachet (%lu signaturer)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 msgid "honor the preferred keyserver URL set on the key"
 msgstr ""
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ADVARSEL: n�kkelserver-valget �%s� er ikke i bruk p� denne plattformen\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 msgid "disabled"
 msgstr "utkoblet"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "n�kkelen �%s� ble ikke funnet p� n�kkelserveren\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 msgid "key not found on keyserver\n"
 msgstr "n�kkelen ble ikke funnet p� n�kkelserver\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "ber om n�kkelen %s fra %s server %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "ber om n�kkel %s fra %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "s�ke etter navn fra %s server %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "s�ker etter navn fra %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s�ke etter �%s� fra %s server %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s�ker etter �%s� fra %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 msgid "no keyserver action!\n"
 msgstr "ingen handling for n�kkelserver!\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr "n�kkelserver sendte ikke VERSION\n"
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 msgid "keyserver timed out\n"
 msgstr "n�kkelserver svarte ikke tidsnok\n"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 msgid "keyserver internal error\n"
 msgstr "intern feil ved n�kkelserver\n"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "kommunikasjonsfeil med n�kkelserver: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ADVARSEL: klarte ikke � oppfriske n�kkel %s via %s: %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "oppfrisker 1 n�kkel fra %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "oppfrisker %d n�kler fra %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ADVARSEL: klarte ikke � fange URI %s: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ADVARSEL: klarte ikke � parse URI %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, 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:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, 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:381
+#: g10/mainproc.c:385
 #, c-format
 msgid "public key is %s\n"
 msgstr "offentlig n�kkel er %s\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "offentlig n�kkel-kryptert data: god DEK\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      �%s�\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kryptert med %s-n�kkel, ID %s\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "offentlig n�kkel-dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr ""
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr ""
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "opprinnelig filnavn=�%.*s�\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 msgid "no signature found\n"
 msgstr "ingen signatur ble funnet\n"
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur opprettet %s\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               bruker %s n�kkel %s\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "N�kkel tilgjengelig ved: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra �%s�"
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utg�tt signatur fra �%s�"
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra �%s�"
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[usikker]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka �%s�"
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signatur utg�tt %s\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signatur utg�r %s\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, digestalgoritme %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "bin�r"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "tekstmodus"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "ukjent"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr ""
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell offentlig n�kkel-algoritme %s\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell cipheralgoritme %s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "vennligst se %s for mer informasjon\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr ""
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "flertydig valg �%s�\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukjent valg �%s�\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fila �%s� finnes. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 msgid "Overwrite? (y/N) "
 msgstr "Overskrive (j/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr ""
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Tast inn nytt filnavn"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "skriver til stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "antar at signert data er i �%s�\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "ny konfigurasjonsfil �%s� ble opprettet\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, 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"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen �%s� ble opprettet\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�kkelid %s)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4727,27 +4732,27 @@ msgstr ""
 "�%.*s�\n"
 "%u-bit %s n�kkel, ID %s, opprettet %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Gjenta passfrase\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Tast inn passfrase\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr "kan ikke sp�rre om passfrase i batchmodus\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Tast inn passfrase: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4756,21 +4761,21 @@ msgstr ""
 "Du trenger en passfrase for � l�se opp den hemmelige n�kkelen for\n"
 "brukeren: �%s�\n"
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s-n�kkel, ID %s, opprettet %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Gjenta passfrase: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4779,158 +4784,158 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "kan ikke �pne JPEG-fil �%s�: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Er du sikker p� at du vil bruke den? (j/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "�%s� er ikke et JPEG-fil\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr ""
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr ""
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "Ingen grunn er angitt"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "N�kkelen er overg�tt"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "N�kkelen har blitt kompromittert"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "N�kkelen er ikke lengre i bruk"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "Brukerid er ikke lengre gyldig"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "grunnen for opphevelse: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "kommentar til opphevelse: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 msgid "No trust value assigned to:\n"
 msgstr "Ingen tillitsverdi tilordnet til:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  aka �%s�\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "Hvor mye stoler du p� at denne n�kkelen faktisk tilh�rer den angitte "
 "brukeren?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = Jeg vet ikke eller vil ikke uttale meg\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = Jeg stoler IKKE p� den\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = Jeg stoler fullstendig p� den\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 msgid "  m = back to the main menu\n"
 msgstr "  m = tilbake til hovedmenyen\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  s = skip this key\n"
 msgstr "  s = hopp over denne n�kkelen\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  q = quit\n"
 msgstr "  q = avslutt\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Valget ditt? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vil du virkelig sette denne n�kkelen til fullstendig tillit? (j/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Sertifikater som f�rer til en fullstendig betrodd n�kkel:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Det finnes ingen indikasjon p� at denne n�kkelen faktisk tilh�rer den "
 "angitte eieren\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Det er begrenset indikasjon p� at denne n�kkelen faktisk tilh�rer den "
 "angitte eieren\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 msgid "This key probably belongs to the named user\n"
 msgstr "Denne n�kkelen tilh�rer sannsynligvis den angitte eieren\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "denne n�kkelen tilh�rer oss\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -4940,110 +4945,110 @@ msgstr ""
 "brukeriden.  Dersom du *virkelig* vet hva du gj�r, kan du besvare det\n"
 "neste sp�rsm�let med ja.\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 msgid "Use this key anyway? (y/N) "
 msgstr "Bruke denne n�kkelen likevel? (j/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ADVARSEL: Bruker ubetrodd n�kkel!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "ADVARSEL: n�kkel %s kan v�re opphevet: opphevingsn�kkel %s ikke tilstede.\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ADVARSEL: Denne n�kkelen har blitt opphevet av den utpekte oppheveren!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne n�kkelen har blitt opphevet av dens eier!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Dette kan bety at signaturen er falsk.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne undern�kkelen har blitt opphevet av eieren!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Merk: Denne n�kkelen har blitt utkoblet.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Merk: Denne n�kkelen er utg�tt!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ADVARSEL: Denne n�kkelen er ikke sertifisert med en betrodd signatur!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Det er ingen indikasjon p� at signaturen tilh�rer eieren.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ADVARSEL: Vi stoler IKKE p� denne n�kkelen!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen er sannsynligvis et FALSKNERI.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ADVARSEL: Denne n�kkelen er ikke sertifisert med tilstrekkelige betrodde "
 "signaturer!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det er ikke sikkert at signaturen tilh�rer brukeren.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: hoppet over: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppet over: offentlig n�kkel er allerede tilstede\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Du oppga ikke en brukerid. (Du kan bruke �-r�)\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5051,167 +5056,167 @@ msgstr ""
 "\n"
 "Tast inn brukeriden.  Avslutt med en blank linje: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Det finnes ingen slik brukerid.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "hoppet over: offentlig n�kkel allerede satt som standard mottaker\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "Offentlig n�kkel er utkoblet.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "hoppet over: offentlig n�kkel er allerede satt\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "ukjent standardmottaker �%s�\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppet over: offentlig n�kkel er utkoblet\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adressater\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr ""
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr ""
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "p�tvinging av kompresjonsalgoritme %s bryter med mottakerens preferanser\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTIS: hemmelig n�kkel %s utgikk den %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr ""
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr ""
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "n�kkel %s: ingen brukerid\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Lage et utpekt opphevingssertifikat for denne n�kkelen? (j/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr ""
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr ""
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr ""
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Lage et opphevingssertifikat for denne n�kkelen? (j/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr ""
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr ""
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5222,118 +5227,118 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr ""
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr ""
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 msgid "Is this okay? (y/N) "
 msgstr "Er dette i orden? (j/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr ""
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Ugyldig passfrase; vennligst pr�v igjen"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "svak n�kkel ble opprettet - pr�ver p� nytt\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "kan ikke unng� svak n�kkel for symmetrisk krypteringsalgorime; pr�vde %d "
 "ganger!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 
 # Er dette entallsformen av denne strengen?
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5342,7 +5347,7 @@ msgstr ""
 "klokkeproblem)\n"
 
 # Er dette flertallsformen av denne og den forrige strengen?
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5350,75 +5355,59 @@ msgstr ""
 "n�kkel %s ble opprettet %lu sekunder i fremtiden (time warp eller "
 "klokkeproblem)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "n�kkel %s: ingen undern�kkel for undern�kkelopphevingssignatur\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "n�kkel %s: ingen undern�kkel for undern�kkelbindingssignatur\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr ""
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s-signatur fra: �%s�\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5426,387 +5415,387 @@ msgstr ""
 "ADVARSEL: p�tvinging av kompresjonsalgoritme %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "hoppet over �%s�: er duplikat\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppet over �%s�: %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr ""
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "feil med �%s�: %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "for lang linje"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "ugyldig fingeravtrykk"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "verdi for eiertillit mangler"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "lesefeil ved �%s�: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "kan ikke aksere �%s�: %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "kan ikke opprette l�s for �%s�\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "kan ikke l�se �%s�\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr ""
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "n�kkel %s: godtatt som betrodd n�kkel\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "n�kkel %s: ingen offentlig n�kkel for betrodd n�kkel - hoppet over\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "n�kkel %s markert som endelig betrodd.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[ opphevet]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[ utg�tt]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[ ukjent]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[ udef ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "fant ikke offentlig n�kkel %s: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/verify.c:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5818,302 +5807,302 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "generell feil"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "ukjent pakketype"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "ukjent versjon"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "ukjent pubkey-algoritme"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "ukjent digest-algoritme"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "ugyldig offentlig n�kkel"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "ugyldig hemmelig n�kkel"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "ugyldig signatur"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "sjekksumfeil"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "ugyldig passfrase"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "fant ikke offentlig n�kkel"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "ukjent kryptoalgoritme"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "kan ikke �pne n�kkelknippet"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "ugyldig pakke"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "ugyldig beskyttelse"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "det finnes ingen slik brukerid"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "hemmelig n�kkel er ikke tilgjengelig"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "feil hemmelig n�kkel ble brukt"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "ikke st�ttet"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "ugyldig n�kkel"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "feil ved lesing av fil"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "feil ved skriving av fil"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "ukjent kompresjonsalgoritme"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "feil ved �pning av fil"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "feil ved opprettelse av fil"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "ugyldig passfrase"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "uimplementert pubkey-algoritme"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "uimplementert kryptoalgoritme"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "ukjent signaturklasse"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "feil med tillitsdatabasen"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "ugyldig MPI"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "ressursgrense"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "ugyldig n�kkelknippe"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "ugyldig sertifikat"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "vansired brukerid"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "feil ved lukking av fil"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "feil ved omd�ping av fil"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "feil ved sletting av fil"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "uforventet data"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "konflikt mellom tidsstempler"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "ubrukelig pubkey algoritme"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "fila finnes fra f�r av"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "svak n�kkel"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "ugydig argument"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "ugyldig URI"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "ust�ttet URI"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "nettverksfeil"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "ikke kryptert"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "ikke behandlet"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "ubrukelig offentlig n�kkel"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "ubrukelig hemmelig n�kkel"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "feil med n�kkelserver"
 
-#: util/errors.c:109
+#: util/errors.c:107
 msgid "canceled"
 msgstr ""
 
-#: util/errors.c:110
+#: util/errors.c:108
 msgid "no card"
 msgstr ""
 
-#: util/errors.c:111
+#: util/errors.c:109
 msgid "no data"
 msgstr "ingen data"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... dette er en feil (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fant en feil ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "nei"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "avslutt"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "aA"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr "okay|okay"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr "cancel|cancel"
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "ADVARSEL: bruker usikkert minne!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "vennligst se http://www.gnupg.org/faq.html for mere informasjon\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operasjonen er ikke mulig uten initialisert sikkert minne\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan ha brukt feil program for denne oppgaven)\n"
 
diff --git a/po/nl.po b/po/nl.po
index 1349e82c9..684f85b01 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.6\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+0200\n"
 "PO-Revision-Date: 2007-03-05 10:27+0100\n"
 "Last-Translator: Ivar Snaaijer\n"
 "Language-Team: none\n"
@@ -38,92 +38,92 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "kan geen priemgetal genereren met pbits=%u qbits=%u\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "kan geen priemgetal genereren van minder dan %d bits\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "geen entropie module gevonden\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "‘%s’ is in gebruik: %s\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "wacht op vrijkomen van ‘%s’...\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ‘%s’ niet openen: %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "status van ‘%s’ is niet vast te stellen: %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "‘%s’ is geen normaal bestand en wordt genegeerd\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "noot: ’random_seed’ bestand is leeg\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "Waarschuwing: bestandsgrote van ’random_seed’ bestand klopt niet en wordt "
 "genegeerd\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan ‘%s’ niet lezen: %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "noot: ’random_seed’ bestand wordt niet aangepast\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ‘%s’ niet aanmaken: %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan ‘%s’ niet schrijven: %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan ‘%s’ niet sluiten: %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "Waarschuwing: er wordt een onveilige nummer generator gebruikt!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -137,7 +137,7 @@ msgstr ""
 "GEBRUIK DE GEGENEREERDE GEGEVENS NIET!!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -147,7 +147,7 @@ msgstr ""
 "computer. Deze stap duurt even en U verbeterd de kwalitreit van\n"
 "de entropie.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -158,62 +158,62 @@ msgstr ""
 "Er zijn nog niet genoeg willekeurge gegevens. Ga alstublieft een ander\n"
 "programma gebruiken om het OS de kans te geven nog %d bytes te verzamelen\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Het was niet mogelijk de vingerafdruk op te slaan: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Het was niet mogelijk de aanmaakdatum op te slaan: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "het lezen van de publieke sleutel is mislukt: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr "de teruggekregen informatie bevat geen publieke sleutel gegevens\n"
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr "de teruggekregen informatie bevat geen RSA modulus\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr "de teruggekregen informatie bevatten geen RSA publiek exponent\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN reactie gaf een fout: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN voor CHV%d is te kort; deze moet minimaal %d lang zijn\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "controle CHV%d heeft gefaalt: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr "toegang tot beheerders commando's is niet geconfigureerd\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr "Ophalen van de CHV status geeft een fout\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr "kaart is permanent geblokkeerd!\n"
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -223,351 +223,356 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr "|A|Beheerders PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nieuwe beheerders PIN"
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr "|N|Nieuwe PIN"
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fout met nieuwe PIN: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 msgid "error reading application data\n"
 msgstr "fout bij het lezen van programma gegevens\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 msgid "error reading fingerprint DO\n"
 msgstr "fout bij het lezen van de vingerafdruk DO\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 msgid "key already exists\n"
 msgstr "de sleutel bestaat reeds\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr "de bestaande sleutel zal worden vervangen\n"
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 msgid "generating new key\n"
 msgstr "aanmaken nieuwe sleutel\n"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr "aanmaaktijd informatie mist\n"
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modulus is niet aanwezig of heeft niet %d bits\n"
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA publieke exponent is niet aanwezig of is groter dan %d bits\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA priemgetal %s is niet aanwezig of heeft niet %d bits\n"
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "het is mislukt om de sleutel op te slaan: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr "wacht terwijl de sleutel wordt aangemaakt ...\n"
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 msgid "generating key failed\n"
 msgstr "aanmaken van de sleutel is mislukt\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "het aanmaken van de sleutel is voltooid (in %d seconden)\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "verkeerde structuur van de OpenPGP kaart (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "de kaart ondersteund het samenvattings algortime %s niet\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "momenteel gegenereerde ondertekeningen: %lu\n"
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Geef uw PIN%%0A[%lu ondertekeningen gemaakt]"
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "controleren van de beheerders PIN is momenteel niet toegestaan met dit "
 "commando\n"
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan %s niet benaderen - ongeldige OpenPGP kaart?\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "versleuteling: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "ongeldige versleutelings kop: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "versleutelings kop: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "ongeldige ’clearsig’ header\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "versleutelings kop: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "ingesloten platte tekst ondertekeningen\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 msgid "unexpected armor: "
 msgstr "onverwachte versleuteling: "
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "ongeldige streep code lijn: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "ongeldig radix64 karakter %02X overgeslagen\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "onverwacht bestandseinde (geen CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "onverwacht bestandseinde (tijdens het lezen van de CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "ongeldige CRC\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC fout; %06lX - %06lX\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 msgid "premature eof (in trailer)\n"
 msgstr "onverwacht bestandseinde (in de voet tekst)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "fout in voet regel\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "geen geldige OpenPGP gegevens gevonden.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ongeldig versleuteling: de regel is langer dan %d tekens\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "’quoted printable’ teken gevonden in versleutelings gegevens - \n"
 "mogelijk heeft de verzender een slecht gemaakt email programma gebruikt\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP kaart is niet beschikbaar: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP kaart nummer %s gevonden\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "dit is niet mogelijk in automatische modus\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Uw keuze? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr "[niet ingesteld]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 msgid "male"
 msgstr "man"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "female"
 msgstr "vrouw"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "unspecified"
 msgstr "niet gespecifiseerd"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "not forced"
 msgstr "niet geforceerd"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr "geforceerd"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fout: Alleen platte ASCII is hier toegestaan.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fout: U mag het “<” teken hier niet gebruiken.\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fout: U mag geen dubbele spatie gebruiken.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr "Achternaam van de kaarthouder: "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr "Voornaam van de kaarthouder: "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Fout: Gecombineerde naam is te lang (de limiet is %d tekens).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 msgid "URL to retrieve public key: "
 msgstr "URL om de publieke sleutel op te halen: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fout: URL is te lang (de limiet is %d tekens).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fout tijdens het lezen van ‘%s’: %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr "Aanlog gegevens (Login naam): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Fout: Aanlog gegevens zijn te lang (de limiet is %d tekens).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr "Geheime DO-gegevens: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Fout: Geheime DO is te lang (de limiet is %d tekens).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 msgid "Language preferences: "
 msgstr "Taal voorkeur: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fout: verkeerde lengte van de voorkeursgegevens.\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fout: ongeldige tekens in voorkeursgegevens.\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Geslacht ((M)Man, (F)Vrouw of spatie): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 msgid "Error: invalid response.\n"
 msgstr "Fout: Ongeldige invoer.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 msgid "CA fingerprint: "
 msgstr "CA vingerafdruk: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fout: ongeldig vormgegeven vingerafdruk.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "sleutel actie is niet mogelijk: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 msgid "not an OpenPGP card"
 msgstr "geen OpenPGP kaart"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fout bij het ophalen van sleutel gegevens: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Vervangen bestaande sleutel? (j/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 #, fuzzy
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "Moet er een externe reservekopie van de versleutel gegevens gemaakt worden? "
 "(J/n) "
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Vervangen bestaande sleutels? (j/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -578,137 +583,137 @@ msgstr ""
 "   PIN = ‘%s’     Beherder PIN = ‘%s’\n"
 "U wordt aangeraden deze te wijzigen met het commando --change-pin\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 msgid "Please select the type of key to generate:\n"
 msgstr "Selecteer het sleutel type:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 msgid "   (1) Signature key\n"
 msgstr "   (1) Handtekening sleutel\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Codeer sleutel\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authorisatie sleutel\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Ongeldige selectie.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 msgid "Please select where to store the key:\n"
 msgstr "Selcteer waar de sleutel moet worden opgeslagen:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 msgid "unknown key protection algorithm\n"
 msgstr "onbekend beveiligings algoritme\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 msgid "secret parts of key are not available\n"
 msgstr "geheime delen van de sleutel zijn niet beschikbaar\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 msgid "secret key already stored on a card\n"
 msgstr "geheime sleutel staat reeds op de kaart\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "afsluiten van dit menu"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "show admin commands"
 msgstr "tonen beheerder commando's"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "toon deze hulp"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "list all available data"
 msgstr "toon alle beschikbare gegevens"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr "verander de naam van de kaarthouder"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr "verander de URL van de sleutel"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr "download de sleutel van de kaart URL"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change the login name"
 msgstr "verander de aanlog naam"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "change the language preferences"
 msgstr "verander de taal voorkeur"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr "verander de sexe van de kaarthouder"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "change a CA fingerprint"
 msgstr "verander een CA vingerafdruk"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr "wissel de ondertekening forceer PIN vlag"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 msgid "generate new keys"
 msgstr "genereer nieuwe sleutels"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr "keuzelijst voor het deblokkeren of veranderen van de PIN"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr "controleer de PIN en toon alle gegevens"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Commando> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 msgid "Admin-only command\n"
 msgstr "Beheerder commando\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 msgid "Admin commands are allowed\n"
 msgstr "Beheerder commando's zijn toegestaan\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 msgid "Admin commands are not allowed\n"
 msgstr "Beheerder commando's zijn niet toegestaan\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ongeldig commando  (probeer “help”)\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 msgid "card reader not available\n"
 msgstr "kaartlezer is niet beschikbaar\n"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Plaats de kaart en druk op return (of ‘c‘ om te stoppen): "
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "Selecteren van OpenPGP is mislukt: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -717,135 +722,135 @@ msgstr ""
 "Verwijder de huidige kaart en plaats de kaart terug met serienummer :\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Druk op return of ‘c‘ om te stoppen: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr "Geeft nieuwe beheerders PIN: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr "Geef nieuwe PIN: "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr "Geef beheerders PIN: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr "Geef PIN: "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 msgid "Repeat this PIN: "
 msgstr "Herhaal de PIN: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 msgid "PIN not correctly repeated; try again"
 msgstr "de tweede PIN is niet gelijk, probeer opnieuw"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ‘%s’ niet openen\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output werkt niet voor dit commando\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "sleutel ‘%s‘ niet gevonden: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fout tijdens het lezen van sleutelblok: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(tenzij U de vingerafdruk opgeeft)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "dit is onmogelijk in automatische modus zonder het ‘--yes‘ commando\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Deze sleutel van uw sleutelring verwijderen? (j/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Dit is een geheime sleutel! Weet U het zeker? (j/N) "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "verwijderen van sleutelblok is mislukt: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "vertrouwlijkheidsgegevens zijn gewist\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "er is een geheime sleutel voor de publieke sleutel ‘%s‘!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gebruik eerst het commando ‘--delete-secret-keys‘ om te verwijderen.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fout bij het maken van de geheime zin: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "kan geen symmetrish ESK paket gebruiken door de S2K modus\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "versleutelalgoritme %s in gebruik\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "‘%s’ is reeds gecomprimeerd\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "Waarschuwing: ‘%s’ is een leeg bestand\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "U kan alleen maar een RSA sleutel van 2048 bits of minder gebruiken\n"
 "met het --pgp2 commando \n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lezen van ‘%s’\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "het is onmogelijk het IDEA versleutelalgoritme te gebruiken voor de\n"
 "gekozen sleutels.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -853,7 +858,7 @@ msgstr ""
 "Waarschuwing: het forceren van het symetrisch versleutelalgoritme %s (%d)\n"
 "gaat tegen de wens van de ontvanger in\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -862,167 +867,167 @@ msgstr ""
 "Waarschuwing: het forceren van het compressie algoritme %s (%d) gaat\n"
 "tegen de wens van de ontvanger in\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "het forceren van het symetrisch versleutelalgoritme %s (%d) gaat\n"
 "tegen de wens van de ontvanger in\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "U mag %s niet gebruiken in combinatie met %s\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s versleuteld voor: “%s”\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s versleutelde gegevens\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "versleuteld met onbekend algoritme %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "Waarschuwing: het bericht is versleuteld met een zwakke sleutel in het\n"
 "symetriche versleutelalgoritme.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "probleem met het verwerken van het versleutelde pakket\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "het starten van externe programma's wordt niet ondersteund\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kan map ‘%s’ niet maken: %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "externe programma's zijn niet toegestaan omdat bestanbds permissies onveilig "
 "zijn\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "het is op dit platform noodzakelijk tijdelijke bestanden aan te maken\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "kan programma ‘%s’ niet starten: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "kan programma ‘%s’ niet starten: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "systeemfout bij het aanroepen van een extern programma: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "unverwacht einde van een extern programma\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "het is onmogelijk het externe programma te starten\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr ""
 "het is onmogelijk het antwoord van het externe programma te lezen: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 "Waarschuwing: tijdelijk bestand kan niet worden verwijderd (%s) ‘%s’: %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "Waarschuwing: tijdelijke map kan niet worden verwijderd ‘%s’: %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 msgid "export signatures that are marked as local-only"
 msgstr "exporteerd allen ondertekeningen met de ’local-only’ markering"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "exporteren van gebruikers ID attributen (Foto ID's)"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "exporteren van intrekkingssleutels met ’gevoelig’ markering"
 
-#: g10/export.c:67
+#: g10/export.c:65
 msgid "remove the passphrase from exported subkeys"
 msgstr "verwijderen van de ’geheime zin’ van geexporteerde sub-sleutels"
 
-#: g10/export.c:69
+#: g10/export.c:67
 msgid "remove unusable parts from key during export"
 msgstr "verwijder onbruikbare delen van de sleutel tijdens export"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr "verwijder zo veel mogelijk van de sleutel tijdens export"
 
-#: g10/export.c:325
+#: g10/export.c:323
 msgid "exporting secret keys not allowed\n"
 msgstr "het exportern van geheime sleutels is niet toegestaan\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "sleutel %s: niet beveiligd - overgeslagen\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "sleutel %s: PGP 2.x sleutel - overgeslagen\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "sleutel %s: sleutelmateriaal op kaart - overgeslagen\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr "exporteren van een onbeveiligde sub-sleutel\n"
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "het is mislukt de beveiliging van sub-sleutel te halen: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "Waarschuwing: geheime sleutel %s heeft geen eenvoudige ’SK checksum’\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "Waarschuwing: er is niets geexporteerd\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1030,127 +1035,127 @@ msgstr ""
 "@Commando's:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[bestand]|maak een ondertekening"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[bestand]|maak een platte tekst ondertekening"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "maak een losse ondertekening"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "versleutel informatie"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "versleutelen met een symetrisch versleutelalgoritme"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "ontcijferen informatie (standaard)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "controleren van een ondertekening"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "tonen van sleutels"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "tonen van sleutels en ondertekeningen"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "list and check key signatures"
 msgstr "tonen en controleren van ondertekeningen"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "tonen van sleutels en vingerafdrukken"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "tonen geheime sleutels"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "aanmaken van een nieuw sleutelpaar"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "verwijderen van sleutels uit de publieke sleutelring"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "verwijderen van sleutels uit de geheime sleutelring"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "onderteken een sleutel"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "onderteken een sleutel voor persoonlijke doeleinden"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "onderteken of verander een sleutel"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "aanmaken van een intrekkingssleutel certificaat"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "exporteren sleutels"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "exporteren van sleutels naar een sleutel server"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "importeren van sleutels van een sleutel server"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "zoeken naar sleutels op een sleutel server"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "alle sleutels verversen vanaf een sleutel server"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "importeren/samenvoegen sleutels"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr "opvragen kaart status"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr "wijzigen van gegevens op de kaart"
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr "wijzigen van de kaart PIN"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "verversen van de vertrouwens lijst"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [bestanden]|tonen samenvatting"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1160,51 +1165,51 @@ msgstr ""
 "Opties:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "aanmaken ascii versleutelde uitvoer"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAAM|versleutelen voor NAAM"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "gebruik deze gebruikers ID voor ondertekening of decoderen"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|instellen compressie niveau N (0 voor geen)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "gebruik normale tekst modus"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "gebruik als uitvoer bestand"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "langdradig"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "maak geen wijzigingen"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "vragen voor overschrijven"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr "strikt OpenPGP gedrag toepassen"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x uitwisselbare berichten aanmaken"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1212,7 +1217,7 @@ msgstr ""
 "@\n"
 "(lees de handleiding voor een complete lijst van commando's)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1232,15 +1237,15 @@ msgstr ""
 " --list-keys [namen]        toon sleutels\n"
 " --fingerprint [namen]      toon vingerafdrukken\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Fouten graag melden aan <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1250,7 +1255,7 @@ msgstr ""
 "onderteken, controleer, versleutel of decodeer\n"
 "standaard actie wordt bepaald door de invoer\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1258,78 +1263,78 @@ msgstr ""
 "\n"
 "Ondersteunde algoritmen:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "Publike sleutel: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "Versleutel algoritme: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Samenvattings algoritme: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Compressie: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "conflicterende commando's\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = teken gevonden in groep definitie ‘%s’\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "Waarschuwing: onveilige eigendomsinstellingen van thuisdirectory ‘%s’\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "Waarschuwing: onveilige eigendomsinstellingen van configuratie bestand ‘%s’\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Waarschuwing: onveilige eigendomsinstellingen van uitbreiding ‘%s’\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "Waarschuwing: onveilige beveiligingsinstellingen van thuisdirectory ‘%s’\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "Waarschuwing: onveilige beveiligingsinstellingen van configuratie bestand ‘%"
 "s’\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 "Waarschuwing: onveilige beveiligingsinstellingen van uitbreiding ‘%s’\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "Waarschuwing: onveilige map eigendomsinstellingen van thuisdirectory ‘%s’\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1337,20 +1342,20 @@ msgstr ""
 "Waarschuwing: onveilige map eigendomsinstellingen van configuratie bestand ‘%"
 "s’\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "Waarschuwing: onveilige map eigendomsinstellingen van uitbreiding ‘%s’\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "Waarschuwing: onveilige map beveiligingsinstellingen van thuisdirectory ‘%"
 "s’\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1358,555 +1363,555 @@ msgstr ""
 "Waarschuwing: onveilige map beveiligingsinstellingen van configuratie "
 "bestand ‘%s’\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "Waarschuwing: onveilige map beveiligingsinstellingen van uitbreiding ‘%s’\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "onbekend configuratie item ‘%s’\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr "tonen van foto ID bij sleutel lijsten"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr "tonen van procedure URL's bij sleutel lijsten"
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 msgid "show all notations during signature listings"
 msgstr "tonan van alle opmerkingen bij sleutel lijsten"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr "tonen van IETF opmerkingen bij sleutel lijsten"
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr "tonen van gebruikers opmerkingen bij sleutel lijsten"
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "tonen van voorkeur sluetel server bij sleutel lijsten"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr "tonen van gebruikers ID bij sleutel lijsten"
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr "tonen van ingetrokken en verlopen gebruikers ID's bij sleutel lijsten"
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr "tonen van ingetrokken en verlopen sub-sleutels bij sleutel lijsten"
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 msgid "show the keyring name in key listings"
 msgstr "tonen van de sleutelring naam bij sleutel lijsten"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 msgid "show expiration dates during signature listings"
 msgstr "tonen van verval datum bij sleutel lijsten"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Noot: oude standaard optie ‘%s‘ genegeerd\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Noot: geen standaard optie bestand ‘%s’\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optie bestand ‘%s’: %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lezen van opties uit ‘%s’\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Noot: %s is niet voor normaal gebruik!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "versleutelalgoritme uitbreiding ‘%s’ is niet geladen door onveilige\n"
 "instellingen\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’ is geen geldige ondertekening vervaldatum\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’ is geen geldige tekenset\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 msgid "could not parse keyserver URL\n"
 msgstr "het was niet mogelijk de sleutel server URL te lezen\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ongeldige sleutel server opties\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 msgid "invalid keyserver options\n"
 msgstr "ongeldige sleutel server opties\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ongeldige importeer opties\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "ongeldige importeer opties\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ongeldige exporteer opties\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "ongeldige exporteer opties\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ongeldige lijst opties\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 msgid "invalid list options\n"
 msgstr "ongeldige lijst opties\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr "tonen foto ID tijdens ondertekening controle"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr "toon procedure URL tijdens ondertekening controle"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 msgid "show all notations during signature verification"
 msgstr "toon alle opmerkingen tijdens ondertekening controle"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr "toon IETF opmerkingen tijdens ondertekening controle"
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr "toon gebruiker opmerkingen tijdens ondertekening controle"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "toon voorkeurs sleutel server tijdens ondertekening controle"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 msgid "show user ID validity during signature verification"
 msgstr "toon gebruiker ID geldigheid tijdens ondertekening controle"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "toon ingetrokken en verlopen gebruiker ID's tijdens ondertekening controle"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "toon ingetrokken en verlopen gebruiker ID's tijdens ondertekening controle"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr "Controleer ondertekeningen met PKA gegevens"
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 "Verhoog het vertrouwen van ondertekeningen met goedgekeurde PKA gegevens"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ongeldige controle opties\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 msgid "invalid verify options\n"
 msgstr "ongeldige controle opties\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "het is onmogelijk het programma start pad aan te passen naar %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ongeldige auto-key-locate lijst\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr "ongeldige auto-key-locate lijst\n"
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "Waarschuwing: het programma kan een core bestand genereren!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "Waarschuwing: %s overschrijft %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s mag niet gebruikt worden met %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s klopt niet samen met %s!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "Noot: %s is niet beschikbaar in deze versie\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "werkt niet met onveilig geheugen door %s\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "allen ontkoppelde of platte tekst ondertekeningen zijn mogelijk in --pgp2 "
 "modus\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "het is niet mogelijk tegelijk te ondertekenen en versleutelen in --pgp2 "
 "modus\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "U moet bestanden (en geen pipe) gebruiken in --pgp2 modus.\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "versleutelen in --pgp2 modus heeft het IDEA versleutelalgoritme nodig\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "ongeldig versleutelalgoritme gekozen\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "ongeldig samenvatting algoritme gekozen\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 msgid "selected compression algorithm is invalid\n"
 msgstr "ongeldige compressie gekozen\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "ongeldig certificaat samenvatting algoritme gekozen\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed moet groter zijn dan 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed moet groter zijn dan 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth moet vallen tussen dan 1 en 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ongeldige default-cert-level; moet 0, 1, 2, of 3 zijn\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ongeldige min-cert-level; moet 1, 2, of 3 zijn\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Noot: eenvoudige S2K modus (0) wordt sterk afgeraden\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ongeldige S2K modus; moet 0, 1 of 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "ongeldige standaard voorkeuren\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "ongeldig persoonlijk versleutelalgoritme voorkeur\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "ongeldig persoonlijk samenvattings algoritme voorkeur\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "ongeldig persoonlijk compressie algoritme voorkeur\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s werkt nog niet met %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "U mag versleutelalgoritme ‘%s’ niet gebruiken in %s modus\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "U mag samenvattings algoritme ‘%s’ niet gebruiken in %s modus\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "U mag compressie algoritme ‘%s’ niet gebruiken in %s modus\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "initialiseren van TrustDB is mislukt: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Waarschuwing: er zijn ontvangers (-r) opgegeven zonder publieke sleutel "
 "versleuteling\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrische versleuteling van ‘%s’ is mislukt: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [bestandsnaam]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "U kunt --symmetric --encrypt niet gebruiken met --s2k-mode 0 instelling\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "U kunt --symmetric --encrypt niet in %s modus gebruiken\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [bestandsnaam]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "U kunt --symmetric --sign --encrypt niet gebruiken met --s2k-mode 0 "
 "instelling\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "U kunt --symmetric --sign --encrypt niet in %s modus gebruiken\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [bestandsnaam]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruiker-id"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruiker-id"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruiker-id [commando's]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [gebruiker-id] [sleutelringbestand]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sleutelserver verzending is mislukt: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "sleutelserver opvraging is mislukt: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "sleutel exporteren is mislukt: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sleutelserver zoekvraag is mislukt: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "sleutelserver verversing is mislukt: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "verwijderen van versleuteling is mislukt: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "plaatsen van versleuteling is mislukt: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig berichtsamenvattings algoritme ‘%s’\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Begin uw bericht te typen ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "de opgegeven certificaat procedure URL is ongeldig\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "de opgegeven ondertekening procedure URL is ongeldig\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "de opgegeven sleutelserver URL is ongeldig\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "te veel regels in pk cache - uitgeschakeld\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 msgid "[User ID not found]"
 msgstr "[Gebruiker ID niet gevonden]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "‘%s’ automatisch opgehaald via %s\n"
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ongeldeige sleutel %s is geldig gemaakt met --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "geen geheime sub-sleutel voor publieke sub-sleutel %s - overgeslagen\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "er wordt gebruik gemaakt van sub-sleutel %s in plaats an primaire sleutel %"
 "s\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "sleutel %s: geheime sleutel zonder publiek deel - overgeslagen\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "iets minder langdradig"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "gebruik de sleutels van deze sleutelring"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "reduceer tijdmarkerings conflicten tot een waarschuwing"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|schrijf status gegevens van deze FD"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Gebruik: gpgv [opties] [bestanden] (-h voor hulp)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1914,7 +1919,7 @@ msgstr ""
 "Gebruik: gpg [opties] [bestanden]\n"
 "Controleer ondertekeningen met vertrouwde sleutels\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1927,7 +1932,7 @@ msgstr ""
 "en heeft niets van doen met het netwerk-van-certificaten (web-of-"
 "certificates)."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1940,17 +1945,17 @@ msgstr ""
 "sleutel\n"
 "volledig wordt vertrouwd.\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Als u deze niet vertrouwde sleutel toch wilt gebruiken antwoord dan “yes”."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Voer het gebruikers ID in van de ontvanger van dit bericht."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1975,7 +1980,7 @@ msgstr ""
 "De eerste (primaire) sleutel moet altijd gebruikt kunnen worden voor "
 "ondertekeningen."
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1985,16 +1990,16 @@ msgstr ""
 "ondertekeningen en versleuteling. Dit algoritme zou alleen gebruikt mogen\n"
 "worden in speciale gebieden. Vraag een beveiligingsspecialist voor advies."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Geef de lengte van de sleutel"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Antwoord “yes” (Ja) fo “no” (nee)"
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2006,21 +2011,21 @@ msgstr ""
 "foutmelding krijgen - het systeem zal dit proberen te interpreteren als\n"
 "een periode."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Geef de naam van de sleutelhouder"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 "geef alstublieft een emailadres, dit is niet verplicht maar wel sterk "
 "aangeraden"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Geef een optioneel commentaar"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2034,12 +2039,12 @@ msgstr ""
 "O  doorgaan met het aanmaken van de sleutel.\n"
 "Q  om het aanmaken van de sleutel af te breken."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "Antwoord “yes” (of alleen “y”) als het goed is om de sub-sleutel te maken."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2111,11 +2116,11 @@ msgstr ""
 "\n"
 "In geval van twijfel over deze keuze, kies dan “0”."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Antwoord “yes” als U alle gebruikers ID wilt tekenen."
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2123,11 +2128,11 @@ msgstr ""
 "Antwoord “yes” als U werkelijk deze Gebruiker ID wilt wissen.\n"
 "Alle bijbehorende certificaten worden ook gewist!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Antwoord “yes” als U de sub-sleutel wilt wissen"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2138,7 +2143,7 @@ msgstr ""
 "van het vertrouwen in deze sleutel ten opzichte van een andere sleutel\n"
 "met een ondertekening van deze sleutel."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2150,7 +2155,7 @@ msgstr ""
 "sleutel uit te stellen. Het kan zijn dat deze sleutel een verbinding maakt\n"
 "met een sleutel van een reeds gecertificeerde sleutel."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2159,7 +2164,7 @@ msgstr ""
 "sleutelring\n"
 "af te halen."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2173,7 +2178,7 @@ msgstr ""
 "zelf gezette ondertekening is die fout is gegaan en dat er een andere\n"
 "beschikbaar is."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2183,25 +2188,25 @@ msgstr ""
 "met de opgegeven eigenschappen. De tijd indicatie van alle betrokken\n"
 "ondertekeningen zal met een seconde worden opgehoogd.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 "Geef een geheime zin (passphrase); deze zin gebruikt U om de sleutel\n"
 "te beschermen\n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Herhaal de geheime zin, om zeker te zijn dat deze juist is."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Geef de naam van het bestaand waar deze ondertekening van is"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Antwoord “yes” als het bestand overschreven moet worden"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2209,7 +2214,7 @@ msgstr ""
 "Geef alstublieft een nieuwe bestandsnaam. Als U op Enter drukt zal de\n"
 "standaardnaam (tussen de blokhaken) gebruikt worden."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2236,7 +2241,7 @@ msgstr ""
 "      Als de Gebruikers ID niet meer klopt;\n"
 "      Normaalgesproken als het email adres niet meer klopt.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2246,537 +2251,537 @@ msgstr ""
 "certificaat maakt. Gebruik een bondige omschrijving, liefst in de taal\n"
 "gangbaar in de groep waar u het meeste communiceerd.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Geen hulp beschikbaar"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Geen hulp beschikbaar voor ‘%s’"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr "belangrijke ondertekeningen die als lokaal zijn gemarkeerd"
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr "herstel schade van de publieke sleutels tijdens importeren"
 
-#: g10/import.c:100
+#: g10/import.c:98
 msgid "do not update the trustdb after import"
 msgstr "verketer de vertrouwenslijst niet na importeren"
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr "maak een publieke sleutel bij het importeren van een geheime sleutel"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr "accepteer alleen vernieuwingen van aanwezige sleutels"
 
-#: g10/import.c:106
+#: g10/import.c:104
 msgid "remove unusable parts from key after import"
 msgstr "verwijder onbruikbare delen van de sleutel na importeren"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr "verwijder zo veel mogelijk van de sleutel na importeren"
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok van het type %d overgeslagen\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu sleutels tot zo ver verwerkt\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Totaal aantal verwerkt: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " Overgeslagen nieuwe sleutels: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         Zonder Gebruikers ID: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 Geimporteerd: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  Onveranderd: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "        Nieuwe Gebruiker ID's: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          Nieuwe Sub-Sleutels: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        Nieuwe Handtekeningen: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  Nieuwe Sleutel intrekkingen: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     Geheime sleutels gelezen: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "Geheime sleutels geimporteerd: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " Geheime sleutels onveranderd: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            Niet geimporteerd: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "   Handtekeningen opgeschoont: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   Gebruiker ID's opgeschoond: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "Waarschuwing: sleutels %s bevat voorkeuren voor onbeschikbaar\n"
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 msgid "         algorithms on these user IDs:\n"
 msgstr "         algoritmen op deze Gebruiker ID's:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         “%s”: voorkeur voor versleutelalgoritme %s\n"
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         “%s”: voorkeur voor samenvattings algoritme %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         “%s”: voorkeur voor compressie algoritme %s\n"
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "het wordt sterk aangeraden Uw voorkeuren aan te passen en\n"
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "deze sleutel opnieuw te distribueren om een potentieel algoritme conflict te "
 "voorkomen\n"
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "Uw voorkeuren verbeteren met: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "sleutel %s: geen Gebruiker ID\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "sleutel %s: PKS sub-sleutel fouten verbeterd\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "sleutel %s: heeft een niet zelf-getekende Gebruikers ID “%s”\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "sleutel %s: geen geldige Gebruiker ID(s)\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dit kan komen doordat de zelf-ondertekening mist\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "sleutel %s: publieke sleutel niet gevonden: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "sleutel %s: nieuwe sleutel - overgeslagen\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "geen schrijfbaar sleutelringbestand: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "schrijven naar ‘%s’\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fout bij het schrijven naar sleutelring ‘%s’: %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "sleutel %s: publieke sleutel “%s” geimporteerd\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "sleutel %s: klopt niet met onze kopie\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "sleutel %s: kan het orginele sleutelblok niet vinden: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "sleutel %s: kan het orginele sleutelblok niet lezen: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "sleutel %s: “%s” 1 nieuwe gebruikers ID\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "sleutel %s: “%s” %d nieuwe gebruikers ID's\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "sleutel %s: “%s” 1 nieuwe ondertekening\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "sleutel %s: “%s” %d nieuwe ondertekeningen\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "sleutel %s: “%s” 1 nieuwe sub-sleutel\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "sleutel %s: “%s” %d nieuwe sub-sleutels\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "sleutel %s: “%s” %d ondertekening opgeschoond\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "sleutel %s: “%s” %d ondertekeningen opgeschoond\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "sleutel %s: “%s” %d gebruiker ID opgeschoond\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "sleutel %s: “%s” %d gebruiker ID's opgeschoond\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "sleutel %s: “%s” niet veranderd\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "sleutel %s: geheime sleutel met ongeldig versleutelalgoritme %d -\n"
 "overgeslagen\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "importeren van geheime sleutels is niet toegestaan\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "geen standaard geheim sleutelringbestand: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "sleutel %s: geheime sleutel geimporteerd\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "sleutel %s: reeds aanwezige geheime sleutel\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "sleutel %s: geheime sleutel niet gevonden: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "sleutel %s: geen publieke sleutel - kan intrekkingscertificaat niet "
 "toepassen\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "sleutel %s: ongeldig intrekkingscertificaat: %s - afgewezen\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "sleutel %s: “%s” intrekkingscertificaat geimporteerd\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "sleutel %s: geen Gebruikers ID voor ondertekening\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "sleutel %s: niet ondersteund publieke sleutel algoritme bij Gebruiker ID “%"
 "s”\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "sleutel %s: ongeldige zelf-ondertekening bij Gebruiker ID “%s”\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "sleutel %s: geen sub-sleutel voor sleutel binding\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "sleutel %s: niet ondersteund publieke sleutel algoritme\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "sleutel %s: ongeldige sub-sleutel binding\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "sleutel %s: dubbele sub-sleutel binding verwijderd\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "sleutel %s: geen sub-sleutel bij intrekking\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "sleutel %s: ongeldige sub-sleutel intrekking\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "sleutel %s: dubbele sub-sleutel intrekkingen verwijderd\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "sleutel %s: overgeslagen Gebruiker ID “%s”\n"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "sleutel %s: sub-sleutel overgeslagen\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "sleutel %s: niet exporteerbare ondertekening (klasse 0x%02X) - overgeslagen\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "sleutel %s: intrekkingscertificaat op verkeerde plek - overgeslagen\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "sleutel %s: ongeldig intrekkingscertificaat: %s - overgeslagen\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "sleutel %s: sub-sleutel ondertekening op verkeerde plek - overgeslagen\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "sleutel %s: onverwachte ondertekening klasse (0x%02X) - overgeslagen\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "sleutel %s: dubbele Gebruikers ID gevonden - samengevoegd\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "Waarschuwing: sleutel %s kan ingetrokken zijn: ophalen intrekkingssleutel %"
 "s\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "Waarschuwing: sleutel %s kan ingetrokken zijn: intrekkingssleutel %s niet "
 "aanwezig.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "sleutel %s: “%s” intrekkingscertificaat toegevoegd\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "sleutel %s: directe sleutel ondertekening toegevoegd\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "Noot: een serienummer van een sleutel klopt niet met de kaart\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "Noot: primaire sleutel is online en opgeslagen op de kaart\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "Noot: secondaire sleutel is online en opgeslagen op de kaart\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "fout bij het aanmaken van de sleutelring ‘%s’: %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "sleutelring ‘%s’ is aangemaakt\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "sleutelblok bronnen ‘%s’: %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "het is mislukt om de cache van de sleutelring te herbouwen: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[intrekking]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[zelf-ondertekening]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 slechte ondertekening\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d slechte ondertekeningen\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 ondertekening is niet gecontroleerd door missende sleutel(s)\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ondertekeningen zijn niet gecontroleerd door missende sleutel(s)\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 ondertekening is niet gecontroleerd door een fout\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ondertekeningen is niet gecontroleerd door een fout\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 gebruiker ID zonder zelf-handtekening gevonden\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d gebruiker ID's zonder zelf-handtekening gevonden\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2789,17 +2794,17 @@ msgstr ""
 "vingerafdrukken\n"
 " van verschillende bronnen vergeleken.)\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = Ik vertrouw het maar matig\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = Ik vertrouw het volledig\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2809,49 +2814,49 @@ msgstr ""
 "Als de waarde meer als 1 is, kan deze sleutel vertrouwen uitschrijven op\n"
 "Uw naam.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Geef alstublieft het domein aan waarbinnen deze handtekening geldig\n"
 "is, laat leeg voor geen.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Gebruiker ID “%s” is ingetrokken."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Weet U zeker dat U deze nog wilt ondertekenen? (j/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  Het is niet mogelijk te ondertekenen.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Gebruiker ID “%s” is verlopen."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Gebruiker ID “%s” is niet zelf-ondertekened."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Gebruiker ID “%s” is te ondertekenen.  "
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Ondertekenen? (j/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2860,12 +2865,12 @@ msgstr ""
 "De zelf-ondertekening van “%s”\n"
 "is een PGP 2.x ondertekening.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 #, fuzzy
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Wilt u deze opwarderen tot een OpenPGP zelf-ondertekening? (j/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2874,14 +2879,14 @@ msgstr ""
 "Uw huidige ondertekening op “%s”\n"
 "is verlopen.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Wilt U een nieuwe ondertekening uitgeven om de verlopen versie te "
 "vervangen ? (j/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2890,47 +2895,47 @@ msgstr ""
 "Uw huidige ondertekening op “%s”\n"
 "is een locale ondertekening.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Wilt u deze opwarderen naar een volledig exporteerbare ondertekening? (j/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“%s” was reeds lokaal ondertekend door sleutel %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“%s” was reeds ondertekend met sleutel %s\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Wilt U toch ondertekenen? (j/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Er is niets te ondertekenen met sleutel %s\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Deze sleutel is verlopen!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Deze sleutel is verlopen na %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Wilt U dat de geldigheid van de ondertekening net zo lang is? (J/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2938,11 +2943,11 @@ msgstr ""
 "U mag geen OpenPGP ondertekening zetten bij een PGP 2.x sleutel als U \n"
 "de optie --pgp2 gebruikt.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Dit maakt de sleutel onbruikbaar met PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2951,31 +2956,31 @@ msgstr ""
 "Hoe zorgvuldig heeft U gecontroleerd dat deze sleutel werkelijk van de \n"
 "hierboven genoemde persoon is ? In geval van twijfel moet U “0” kiezen\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Hierop geef ik geen antwoord.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ik heb het niet gecontroleerd.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ik heb een aantal controles uitgevoerd.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ik heb zeer zorgvuldig gecontroleerd.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Uw keuze? (geef ‘?’ voor meer informatie): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2984,81 +2989,81 @@ msgstr ""
 "Weet u zeker dat U deze sleutel wilt ondertekenen met Uw sleutel\n"
 " “%s” (%s)\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 msgid "This will be a self-signature.\n"
 msgstr "Dit is een zelf-ondertekening.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "Waarschuwing: de ondertekening zal niet als 'niet exporteerbaar'\n"
 "worden gemarkeerd\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "Waarschuwing: de ondertekening zal niet als 'niet intrekbaar'\n"
 "worden gemarkeerd\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "De ondertekening wordt 'niet exporteerbaar' gemarkeerd.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "De ondertekening wordt 'niet intrekbaar' gemarkeerd.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "I have not checked this key at all.\n"
 msgstr "Ik heb deze sleutel niet gecontroleerd.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 msgid "I have checked this key casually.\n"
 msgstr "Ik heb enige controles uitgevoerd.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 msgid "I have checked this key very carefully.\n"
 msgstr "Ik heb deze sleutel zorgvuldig gecontroleerd.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Weet u het zeker? (j/N) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "ondertekenen is mislukt: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Deze sleutel bestaat alleen uit een verwijzing -\n"
 "er is geen geheime zin om te veranderen.\n"
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime delen van primaire sleutels zijn niet beschikbaar.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Geheime delen van primaire sleutels zijn opgeslagen op een kaart.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Deze sleutel kan niet aangepast worden: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3066,11 +3071,11 @@ msgstr ""
 "Geef de nieuwe 'geheime zin' voor deze geheime sleutel.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "de geheime zin is niet twee keer hetzelfde; probeer opnieuw"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3079,193 +3084,193 @@ msgstr ""
 "idee\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Weet u het zeker? (j/N) "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "verplaatsen van de sleutel ondertekening naar de juiste plek\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "opslaan en stoppen"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "toon sleutel vingerafdruk"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "tonen sleutels en Gebruiker ID's"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "selecteer Gebruiker ID N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "selecteer sub-sleutel N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "controleren ondertekeningen"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "onderteken geselecteerde Gebruikers ID's\n"
 "[* zie hieronder voor gerelateerde commando's]"
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs locally"
 msgstr "onderteken geselecteerde Gebruiker ID's lokaal"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 "onderteken geselecteerde Gebruiker ID's met een vertrouwens ondertekening"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "onderteken geselecteerde Gebruiker ID's met een niet ophefbare\n"
 "ondertekening"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "toevoegen van een Gebruiker ID"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "toevoegen van een foto ID"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 msgid "delete selected user IDs"
 msgstr "verwijder geslecteerde Gebruiker ID's"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "add a subkey"
 msgstr "toevoegen van een sub-sleutel"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr "toevoegen van een sleutel op de smartcard"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr "verplaatsen van een sleutel naar de smartcard"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr "verplaatsen van een reserve sleutel naar de smartcard"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 msgid "delete selected subkeys"
 msgstr "verwijderen van geselecteerde sub-sleutels"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "toevoegen van een intrekkingssleutel"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 msgid "delete signatures from the selected user IDs"
 msgstr "verwijder ondertekeningen van de geslecteerde Gebruiker ID's"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "verander de verval datum voor de geselecteerde (sub-)sleutels"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 msgid "flag the selected user ID as primary"
 msgstr "markeer de geselecteerde Gebruikers ID als primair"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 msgid "toggle between the secret and public key listings"
 msgstr "wissel tussen de geheime en publieke sleutel lijsten"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "toon voorkeuren (expert)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "toon voorkeuren (langdradig)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "set preference list for the selected user IDs"
 msgstr "stel voorkeuren in voor de geselecteerde Gebruikers ID's"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "stel de voorkeur sleutel server URL in voor de geselecteerde Gebruiker ID's"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 msgid "set a notation for the selected user IDs"
 msgstr "stel de schrijfwijze in voor de geselecteerde Gebruikers ID's"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "wijzig de geheime zin"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "wijzig eigenaarsvertrouwen"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 msgid "revoke signatures on the selected user IDs"
 msgstr "ingetrekken van de ondertekeningen van de geselecteerde Gebruiker ID's"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 msgid "revoke selected user IDs"
 msgstr "ingetrekken van de geselecteerde Gebruiker ID's"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "revoke key or selected subkeys"
 msgstr "intrekken sleutel of geselecteerde sub-sleutels"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 msgid "enable key"
 msgstr "inschakelen sleutel"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 msgid "disable key"
 msgstr "uitzetten sleutel"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 msgid "show selected photo IDs"
 msgstr "tonen geselekteerde foto ID's"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "compact unusable user IDs and remove unusable signatures from key"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "comprimeer onbruikbare Gebruiker ID's en verwijder onbruikebare\n"
 "ondertekeningen van de sleutel"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Fout bij het lezen van geheim sleutelblok “%s”: %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Geheime sleutel is beschikbaar.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Hiervoor is een geheime sleutel noodzakelijk.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Gebruik eerst het “wissel” (toggle) commando.\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3278,240 +3283,240 @@ msgstr ""
 "vertrouwensondertekening (tsign), een ‘nr’ (non-revocable) code\n"
 " of een combinatie van deze (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "Sleutel is ingetrokken."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Weet U zeker dat U alle Gebruiker ID's wilt ondertekenen? (j/N) "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Selecteer de Gebruiker ID's die U wilt ondertekenen\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Onbekend ondertekeningstype ‘%s’\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Dit commando is niet toegestaan in %s modus.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "U moet minimaal een Gebruiker ID selecteren.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "U kan de laatste Gebruiker ID niet verwijderen!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 "Wilt U wereklijk alle geselecteerde Gebruiker ID's verwijderen ? (j/N) "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Weet u zeker dat u deze Gebruiker ID wilt verwijderen ? (j/N) "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Weet u zeker dat U de primaire sleutel wilt verplaatsen ? (j/N) "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 msgid "You must select exactly one key.\n"
 msgstr "U moet een (1) sleutel selecteren.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr "Commando verwacht een bestandsnaam als argument\n"
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Kan ‘%s’ niet openenen: %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Fout bij het lezen van reserve sleutel van ‘%s’: %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "U moet minimaal een sleutel selecteren.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Weet U zeker dat u de geselecteerde sleutels wilt wissen? (j/N) "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Weet U zeker dat u deze sleutel wilt wissen? (j/N) "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Wilt U de geselecteerde Gebruiker ID's intrekken? (j/N) "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Wilt U deze Gebruiker ID intrekken? (j/N) "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Wilt U deze sleutel volledig intrekken? (j/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Wilt U de geselecteerde sub-sleutels intrekken? (j/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Wilt U deze sub-sleutel intrekken? (j/N) "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Eigenaarsvertrouwen kan niet ingesteld worden in een door een gebruiker\n"
 "aangeboden vertrouwenslijst\n"
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 msgid "Set preference list to:\n"
 msgstr "Stel voorkeur lijst in:\n"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "De voorkeuren aanpassen van de geselecteerde Gebruiker ID's? (j/N) "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "De voorkeuren aanpassen? (j/N) "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Aanpassingen opslaan? (j/N) "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Stoppen zonder opslaan? (j/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "update failed: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aanpassen van geheimen is mislukt: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "Sleutel is niet aangepast, dus er is geen verbetering nodig.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Samenvatting: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Eigenschappen: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr "Sleutelserver is niet wijzigbaar"
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Voorkeur sleutelserver: "
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 msgid "Notations: "
 msgstr "Opmerkingen: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Er zijn geen voorkeuren in een PGP 2.x Gebruiker ID.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Deze sleutel is ingetrokken op %s door %s sleutel %s\n"
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Deze sleutel kan zijn ingetrokken door %s sleutel %s"
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 msgid "(sensitive)"
 msgstr "(gevoelig)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, c-format
 msgid "created: %s"
 msgstr "aangemaakt: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, c-format
 msgid "revoked: %s"
 msgstr "ingetrokken: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "verlopen: %s"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, c-format
 msgid "expires: %s"
 msgstr "vervaldatum: %s"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, c-format
 msgid "usage: %s"
 msgstr "gebruik: %s"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, c-format
 msgid "trust: %s"
 msgstr "vertrouwen: %s"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr "geldigheid: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Deze sleutel is uitgeschakeld"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr "kaart nummer: "
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3520,17 +3525,17 @@ msgstr ""
 "mogelijk\n"
 "incorrect is tot U de applicatie herstart.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "ingetrokken"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "verlopen"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3538,7 +3543,7 @@ msgstr ""
 "Waarschuwing: Er is gene primaire sleutel opgegeven. Dit commando kan\n"
 "              er een andere Gebruiker ID gebruikt wordt dan verwacht.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3547,79 +3552,79 @@ msgstr ""
 "Waarschuwing: Dit is een PGP2 sleutel. Het toevoegen van een foto ID kan er\n"
 "              voor zorgen dat deze sleutel niet meer in PGP2 wordt herkend.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Weet U zeker dat U dit wilt toevoegen? (j/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "U kan geen foto ID toevoegen op een PGP2 sleutel.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 #, fuzzy
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deze correcte ondertekening verwijderen? (j/N/s)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 #, fuzzy
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deze ongeldige ondertekening verwijderen? (j/N/s)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 #, fuzzy
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deze onbekende ondertekening verwijderen? (j/N/s)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 #, fuzzy
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Deze zelf ondertekening verwijderen? (j/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Ondertekening %d verwijderd.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Ondertekeningen %d verwijderd.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Niets verwijderd.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "ongeldig"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Gebruiker ID “%s” is gecomprimeerd: %s\n"
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Gebruiker ID “%s”: %d ondertekening verwijderd\n"
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Gebruiker ID “%s”: %d ondertekeningen verwijderd\n"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Gebruiker ID “%s”: reeds geminimaliseerd\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Gebruiker ID “%s”: reeds opgeschoond\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3629,35 +3634,35 @@ msgstr ""
 "         alternative intrekker kan er voor zorgen dat het niet altijd werkt "
 "met PGP.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "U kan geen alternative intrekker toevoegen aan een PGP 2.x sleutel.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geef de Gebruiker ID van de alternative intrekker: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "Het is niet mogelijk een PGP 2.x sleutel te gebruiken als alternative\n"
 "intrekker\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "Het is niet mogelijk de eigen sleutel te gebruiken als alternative\n"
 "intrekker\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "deze sleutel is al opgegeven als alternative intrekker\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "Waarschuing: een alternative intrekker kan niet ontkoppeld worden!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3665,333 +3670,333 @@ msgstr ""
 "Weet U zeker dat u deze sleutel op wilt geven als alternative intrekker? (j/"
 "N) "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Haal de gekozen onderdelen uit de geheime sleutel.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 msgid "Please select at most one subkey.\n"
 msgstr "Selecteer een (1) sub-sleutel.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Verander de vervaldatum van de sub-sleutel.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Verander de vervaldatum voor de primaire sleutel.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "U kan de vervaldatum van een v3 sleutel niet veranderen\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "Er is geen overeenkomstige ondertekening in de geheime sleutel\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "ondertekening sub-sleutel %s is reeds bevestigd\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "sub-sleutel %s ondertekend niet en hoeft dus niet bevestigd te zijn\n"
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Selecteer een (1) Gebruiker ID.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "v3 zelf-ondertekening op Gebruiker ID “%s” overgeslagen\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr "Geef de URL van de sleutelserver van uw voorkeur: "
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Weet u zeker dat U deze wilt vervangen? (j/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Weet u zeker dat u deze wilt verwijderen? (j/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 msgid "Enter the notation: "
 msgstr "Geef de notatie: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Doorgaan? (j/N) "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Er is geen Gebruiker ID met index %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Er is geen Gebruiker ID met hash %s\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Er is geen subsleutel met index %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Gebruiker ID: “%s”\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "Ondertekend met uw sleutel %s op %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (niet exporteerbaar)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Deze ondertekening is verlopen op %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Weet u zeker dat u deze wilt intrekken? (j/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Aanmaken intrekkingscertificaat voor deze ondertekening? (j/N) "
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "U heeft deze Gebruiker IDs ondertekend op sleutel %s:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 msgid " (non-revocable)"
 msgstr " (niet intrekbaar)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "ingetrokken door uw sleutel %s op %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "U gaat deze ondertekeningen intrekken:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wilt u deze intrekcertificaten maken? (j/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "geen geheime sleutel\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Gebruiker ID “%s” is reeds ingetrokken\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "Waarschuwing: een Gebruiker ID is %d seconden in de toekomst gedateerd\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Sleutel %s is reeds ingetrokken.\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Sub-sleutel %s is reeds ingetrokken.\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Tonen %s foto ID van formaat %ld voor sleutel %s (Gebruiker ID %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "voorkeur ‘%s’ overgenomen\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "te veel versleutelalgoritme voorkeuren\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "te veel samenvattingsalgoritme voorkeuren\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "te veel compressie voorkeuren\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "ongeldige waarde ‘%s’ in voorkeursinstellingen\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "directe ondertekening schrijven\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "zelf-ondertekening schrijven\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "sleutel koppel ondertekening schrijven\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "sleutellengte is ongeldig; %u bits worden gebruikt\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "sleutellengte vergroot tot %u bits\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 msgid "Sign"
 msgstr "Ondertekenen (Sign)"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr "Certificeren"
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 msgid "Encrypt"
 msgstr "Versleutelen (Encrypt)"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr "Authenticeren"
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr "OoVvAaSs"
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Mogelijke acties voor een %s sleutel: "
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr "Momenteel toegestane acties: "
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Onderteken mogelijkheid omschakelen\n"
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Versleutel mogelijkheid omschakelen\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Authenticatie mogelijkheid omschakelen\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Voltooid\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecteer het soort sleutel dat u wilt:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA en Elgamal (default)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (eigen mogelijkheden instellen)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (alleen versleutelen)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (encrypt only)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (eigen mogelijkheden instellen)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA sleutelpaar krijgt %u bits.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s sleutels moeten tussen %u en %u bits lang zijn.\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Welke sleutellengte wilt u? (%u) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s sleutels moeten tussen %u en %u bits lang zijn\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4007,7 +4012,7 @@ msgstr ""
 "      <n>m = sleutel verloopt na n maanden\n"
 "      <n>y = sleutel verloopt na n jaar\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4023,38 +4028,38 @@ msgstr ""
 "      <n>m = ondertekening verloopt na n maanden\n"
 "      <n>y = ondertekening verloopt na n jaar\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "Is de sleutel geldig voor? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Is de ondertekening geldig voor? (%s) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "ongeldige waarde\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 msgid "Key does not expire at all\n"
 msgstr "Sleutel verloopt niet\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 msgid "Signature does not expire at all\n"
 msgstr "Ondertekening verloopt niet\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Sleutel is verlopen na %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Ondertekening is verlopen na %s\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4062,12 +4067,12 @@ msgstr ""
 "Uw systeem kan geen datum weergeven na 2038.\n"
 "Het wordt echter wel juist afgehandeld tot 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Is dit correct? (j/N) "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4083,44 +4088,44 @@ msgstr ""
 "    “Henri Koot (Directeur van het cijfer) <[email protected]>”\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Werkelijke naam: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Ongeldig teken in de naam\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "Naam mag niet met een cijfer beginnen\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "Naam moet minimaal 5 tekens lang zijn\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "Email adres: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Geen geldig email adres\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Opmerking: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Ongeldig teken in het commentaar\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U gebruikt de ‘%s’ tekenreeks.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4131,7 +4136,7 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Plaats het email adres alstublieft niet in het Naam of Commentaar veld\n"
@@ -4147,23 +4152,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Verander (N)aam, (C)ommentaar, (E)mail of (S)toppen? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Verander (N)aam, (C)ommentaar, (E)mail of (O)kay/(S)toppen? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Verbeter eerst de fout\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4171,12 +4176,12 @@ msgstr ""
 "U moet een geheime zin opgeven om uw geheime sleutel te beschermen.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4188,7 +4193,7 @@ msgstr ""
 "gebruik hiervoor de optie “--edit-key”.\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4199,50 +4204,50 @@ msgstr ""
 "nu even iets anders gaat doen op de computer (met de muis of harde schijf)\n"
 "terwijl dit gebeurd, hierdoor ontstaat meer gewenste willekeur.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Het aanmaken van de sleutel is onderbroken.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "Publieke sleutel wordt opgeslagen in ‘%s’\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "Geheime sleutel verwijzing wordt opgeslagen in ‘%s’\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "Geheime sleutel wordt opgeslagen in ‘%s’\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "geen schrijfbare publieke sleutelring gevonden: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "geen schrijfbare geheime sleutelring gevonden: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "schrijven publieke sleutelring ‘%s’ mislukt: %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "schrijven geheime sleutelring ‘%s’ mislukt: %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "publieke en geheime sleutel zijn aangemaakt en ondertekened.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4250,12 +4255,12 @@ msgstr ""
 "Deze sleutel kan niet gebruikt worden voor versleuteling. U kunt hiervoor\n"
 "met het commando “--edit-key” een subsleutel aanmaken.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Sleutel aanmaken is mislukt: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4263,7 +4268,7 @@ msgstr ""
 "sleutel is %lu seconde in de toekomst gemaakt (tijd ruimte lus of problemen "
 "met de klok)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4271,692 +4276,692 @@ msgstr ""
 "sleutel is %lu seconden in de toekomst gemaakt (tijd ruimte lus of problemen "
 "met de klok)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Noot: v3 subsleutels zijn niet toegestaan in de OpenPGP standaard\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Werkelijk aanmaken? (j/N) "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "sleutel is niet op de kaart opgeslagen: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan reservebestand ‘%s’ niet maken: %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "Noot: reserve bestand van de kaart sleutel opgeslagen als ‘%s’\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "nooit     "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Kritieke ondertekeningsbeleid: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "ondertekeningsbeleid: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "Kritieke voorkeurs sleutelserver: "
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Kritieke ondertekening notitie: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Ondertekening notitie: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Sleutelring"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Vingerafdruk van de primaire sleutel:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "      Vingerafdruk van de Sub-Sleutel:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr " Vingerafdruk van de primaire sleutel:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "      Vingerafdruk van de Sub-Sleutel:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 msgid "      Key fingerprint ="
 msgstr "      Vingerafdruk van de Sleutel ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr "         Serienummer van de kaart ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "hernoemen van ‘%s’ naar ‘%s’ is mislukt: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "Waarschuwing: er zijn twee bestanden met vertrouwlijke informatie.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s is de ongewijzigde\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s is de nieuwe\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Los dit beveiligingsprobleem alstublieft op\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "inlezen sleutelring ‘%s’\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu sleutels tot nu toe ingelezen (%lu ondertekeningen)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu sleutels ingelezen (%lu ondertekeningen)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: sleutelring aangemaakt\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr "toon ook ingetrokken sleutels"
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr "zoek ook op sub-sleutels als een sleutel ID wordt gezocht"
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 "gebruik tijdelijke bestanden om gegevens naar de sleutelsever te sturen"
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr "tijdelijke bestanden laten staan na gebruik"
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "Sleutels automatische ophalen bij het controleren van ondertekeningen"
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "gebruik de voorkeur sleutelserver zoals vermeld bij de sleutel"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr "gebruik het de PKA informatie bij het ophalen van de sleutel"
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "Waarschuwing: sleutelserver optie '%s' is niet geldig op dit platform\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 msgid "disabled"
 msgstr "uitgeschakeld"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Geef getallen, Volgende(N) , of Stoppen(Q) > "
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ongeldig sleutelserver protocol (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "sleutel '%s' niet gevonden op de sleutelserver\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 msgid "key not found on keyserver\n"
 msgstr "sleutel niet gevonden op de sleutelserver\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "opvragen sleutel %s van %s sleutelserver %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "opvragen sleutel %s van %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "namen zoeken van %s server %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "namen zoeken van %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "versturen van sleutel %s naar %s server %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "versturen van sleutel %s naar %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "zoeken naar '%s' van de %s server %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "zoeken naar '%s' van de %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 msgid "no keyserver action!\n"
 msgstr "geen sleutelserver actie!\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "Waarschuwing: sleutelserver code is van een andere GnuPG versie (%s)\n"
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr "sleutelserver verstuurde geen versie informatie\n"
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "er is geen sleutelserver bekend (gebruik commando --keyserver)\n"
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "externe sleutelservers zijn niet beschikbaar in deze versie\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "geen afhandeling mogelijk van sleutelserver configuratie ‘%s’\n"
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "de actie ‘%s’ is niet ondersteund in de sleutelserver configuratie ‘%s’\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s ondersteund de code met versie %d niet\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 msgid "keyserver timed out\n"
 msgstr "sleutelserver reageert te langzaam\n"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 msgid "keyserver internal error\n"
 msgstr "sleutelserver geeft een interne fout\n"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "communicatie fout met de sleutelserver: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s” is geen sleutel ID: overgeslagen\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "Waarschuwing: het is niet mogelijk sleutel %s via %s te verversen: %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 sleutel ververst vanuit %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d sleutels ververst vanuit %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Waarschuwing: het is niet mogelijk de URI %s te benaderen: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "Waarschuwing: leesfout in URI %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "vreemde lengte van een versleutelde sessie sleutel (%d)\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s versleutelde sessie sleutel\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "geheime zin is gemaakt met onbekend samenvattings algoritme %d\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, c-format
 msgid "public key is %s\n"
 msgstr "publieke sleutel is %s\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "publieke sleutel versleutelde gegevens: juiste DEK\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "versleutel met %u-bit %s sleutel, ID %s, gemaakt %s\n"
 
-#: g10/mainproc.c:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "versleuteld met %s sleutel, ID %s\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publieke sleutel decodering is mislukt : %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "versleuteld met %lu geheime zinnen\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "versleuteld met 1 geheime zin\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "waarschijnlijk %s versleutelde gegevens\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA versleutelalgoritme is niet beschikbaar, maar we gaan met goede moed %s "
 "proberen\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "decodering ok\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "Waarschuwing: bericht was niet beschermd\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Waarschuwing: versleuteld bericht is aangepast!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decoderen mislukt: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "Noot: verzender heeft “Alleen-voor-Uw-ogen” verzocht\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originele bestandsnaam='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "alleenstaande opheffing - gebruik “gpg --import” om deze toe te passen\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 msgid "no signature found\n"
 msgstr "geen ondertekening gevonden\n"
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "ondertekening controle onderdrukt\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan onduidelijke onderteken gegevens niet verwerken\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Ondertekening gemaakt %s\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s sleutel gebruikt %s\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Ondertekening heeft %s gemaakt met %s sleutel ID %s\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "Sleutel beschikbaar vanaf: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Slechte ondertekening van “%s”"
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verlopen ondertekening van “%s”"
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Goede ondertekening van “%s”"
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[onzeker]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                ook bekend als “%s”"
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Ondertekening verlopen %s\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Ondertekening verloopt op %s\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s ondertekeningen, samenvattings algoritme %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "binair"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "tekst"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "onbekend"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "geen ontkoppelde ondertekening\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "Waarschuwing: meerdere ondertekeningen gevonden.  Alleen de eerste wordt "
 "gecontroleerd.\n"
 
-#: g10/mainproc.c:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "alleenstaande onderteklening van klasse 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "PGP 2.x ondertekening\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ongeldig stam pakket gevonden in proc_tree()\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "het is niet mogelijk 'core dumps' uitschakelen: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat of ‘%s’ failed in %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) mislukt in %s: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 "Waarschuwing: U gebruikt een expirimenteel algoritme voor publieke sleutel %"
 "s\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "Waarschuwing: U gebruikt een expirimenteel versleutel algoritme %s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr ""
 "Waarschuwing: U gebruikt een expirimenteel samenvattings algoritme %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "Waarschuwing: samenvattings algoritme %s wordt afgeraden\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "het IDEA versleutelalgoritme is niet beschikbaar\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "lees %s voor meer informatie\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: afgeraden optie “%s”\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "Waarschuwing: “%s” is een afgeraden optie\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "U kunt beter “%s%s” gebruiken\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "Waarschuwing: “%s” is een afgeraden comando - gebruik het niet\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "Ongecomprimeerd"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 msgid "uncompressed|none"
 msgstr "ongecomprimeerd|geen"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "dit bericht kan mogelijk niet gebruikt worden door %s\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "dubbelzinnige optie ‘%s’\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "onbekende optie ‘%s’\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Bestand ‘%s’ bestaat. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Overschrijven? (j/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: onbekende toevoeging\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Geef nieuwe bestandsnaam"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "schrijven naar standaarduitvoer\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "ondertekende gegevens verwacht in ‘%s’\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "nieuw configuratie bestand ‘%s’ gemaakt\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "Waarschuwing: opties in ‘%s’ zijn nu nog niet actief\n"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "map ‘%s’ aangemaakt\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan publieke sleutel algoritme %d niet verwerken\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "Waarschuwing: mogelijk onveilig symetrisch versleutelde sessie sleutel\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "sub-pakket van type %d heeft het kritieke vlag gezet\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent is niet beschikbaar tijdens deze sessie\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "verkeerde vorm van de GPG_AGENT_INFO omgevingsvariabele\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protocol versie %d is niet ondersteund\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan geen verbinding maken met ‘%s’: %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problemen met de agent - gebruik van de agent uitgeschakeld\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (hoofd sleutel ID %s)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4967,27 +4972,27 @@ msgstr ""
 "“%.*s”\n"
 "%u-bit %s sleutel, ID %s, gemaakt op %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Herhaal geheime zin\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Geef geheime zin\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "onderbroken door de gebruiker\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr "kan geheime zin niet opvragen in batch modus\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Geef geheime zin: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4996,21 +5001,21 @@ msgstr ""
 "U moet een geheime zin opgeven om de geheime sleutel te gebruiken\n"
 "van: “%s”\n"
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s key, ID %s, created %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (sub-sleutel bij hoofd sleutel ID %s)"
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Herhaal geheime zin: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5026,119 +5031,119 @@ msgstr ""
 "sleutel!\n"
 "Houd het formaat ongeveer 240x288 voor optimaal resultaat.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Geef JPEG bestand voor foto ID: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "kan JPEG bestand ‘%s’ niet openen: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "dit JPEG bestand is erg groot (%d bytes) !\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Weet U zeker dat U deze wilt gebruiken? (j/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "‘%s’ is geen JPEG bestand\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Is deze foto goed (j/N/s)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr "geen programma geslecteerd om de foto te tonen\n"
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "het is niet mogelijk de foto ID te tonen!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "Geen reden opgegeven"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "Sleutel is vervangen"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "Sleutel is niet meer te vertrouwen"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "Sleutel is niet meer in gebruik"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "Gebruiker ID is niet meer geldig"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "reden van opheffen: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "opmerking bij opheffen: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 msgid "No trust value assigned to:\n"
 msgstr "Er is geen vertrouwenswaarde opgegeven aan:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  ook bekend als “%s”\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "In hoeverre vertrouwd U er op dat deze sleutel werkelijk bij deze persoon "
 "hoort?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = Weet ik nier / Wil ik niet zeggen\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = Ik vertrouw het niet\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = Ik vertrouw het volledig\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 msgid "  m = back to the main menu\n"
 msgstr "  m = terug naar het hoofdmenu\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  s = skip this key\n"
 msgstr "  s = sla deze sleutel over\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  q = quit\n"
 msgstr "  q = stoppen\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5147,42 +5152,42 @@ msgstr ""
 "Het minimale vertrouwensniveau voor deze sleutel is: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Uw keuze? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vertrouwd U deze sleutel werkelijk volledig? (j/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificaten die leiden tot een volledig vertrouwde sleutel:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Er is geen zekerheid dat deze sleutel werkelijk van de genoemde persoon "
 "is\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Er is beperkte zekerheid dat deze sleutel werkelijk van de genoemde "
 "persoon is\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 msgid "This key probably belongs to the named user\n"
 msgstr "Deze sleutel is waarschijnlijk van de genoemde persoon\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Deze sleutel is van ons\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5193,112 +5198,112 @@ msgstr ""
 "in de gebruikers ID. Als U echter HEEL zeker weet wat U doet,\n"
 "kan u op de volgende vraag Ja beantwoorden.\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Deze sleutel echt gebruiken? (j/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "Waarschuwing: U gebruikt een onbetrouwbare sleutel!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "Waarschuwing: deze sleutel kan ingetrokken zijn (maar de intrekkingssleutel "
 "is niet beschikbaar)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "Waarschuwing: Deze sleutel is ingetrokken door de bevoegde intrekker!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "Waarschuwing: Deze sleutel is ingetrokken door de eigenaar!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Dit kan betekenen dat de ondertekening is vervalst.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "Waarschuwing: Deze sub-sleutel is ingetrokken door de eigenaar!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Noot: Deze sleutel is uitgeschakeld.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "Noot: Het gecontroleerde adres van de ondertekenaar is ‘%s’\n"
 
 # TODO
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr "Note: Signer's address ‘%s’ does not match DNS entry\n"
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr "trustlevel adjusted to FULL due to valid PKA info\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr "trustlevel adjusted to NEVER due to bad PKA info\n"
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Note: This key has expired!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNING: This key is not certified with a trusted signature!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         There is no indication that the signature belongs to the owner.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNING: We do NOT trust this key!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         The signature is probably a FORGERY.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         It is not certain that the signature belongs to the owner.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: skipped: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: skipped: public key already present\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "You did not specify a user ID. (you may use “-r”)\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr "Current recipients:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5306,168 +5311,168 @@ msgstr ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "No such user ID.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "skipped: public key already set as default recipient\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "Public key is disabled.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "skipped: public key already set\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "unknown default recipient “%s”\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: skipped: public key is disabled\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "no valid addressees\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data not saved; use option “--output” to save it\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error creating ‘%s’: %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Detached signature.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Please enter name of data file: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "reading stdin ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "no signed data\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "can't open signed data ‘%s’\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonymous recipient; trying secret key %s ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "okay, we are the anonymous recipient.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "old encoding of the DEK is not supported\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "versleutelalgoritme %d%s is unknown or disabled\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "WARNING: versleutelalgoritme %s not found in recipient preferences\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTE: secret key %s expired at %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "NOTE: key has been revoked"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet failed: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "key %s has no user IDs\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "To be revoked by:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(This is a sensitive revocation key)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Create a designated revocation certificate for this key? (j/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII versleutelde uitvoer geforceerd.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet failed: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Revocation certificate created.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "no revocation keys found for “%s”\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "secret key “%s” not found: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "no corresponding public key: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "public key does not match secret key!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Create a revocation certificate for this key? (j/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "unknown protection algorithm\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTE: This key is not protected!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5485,180 +5490,164 @@ msgstr ""
 "your media become unreadable.  But have some caution:  The print system of\n"
 "your machine might store the data and make it available to others!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "Please select the reason for the revocation:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "Cancel"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probably you want to select %d here)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Enter an optional description; end it with an empty line:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Reason for revocation: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(No description given)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Is this okay? (j/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "secret key parts are not available\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "protection algorithm %d%s is not supported\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "protection samenvatting %d is not supported\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Invalid passphrase; please try again"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "WARNING: Weak key detected - please change passphrase again.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "generating the deprecated 16-bit checksum for secret key protection\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "weak key created - retrying\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "cannot avoid weak key for symmetric versleutelalgoritme; tried %d times!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA requires the hash length to be a multiple of 8 bits\n"
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr "DSA key %s uses an unsafe (%u bit) hash\n"
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr "DSA key %s requires a %u bit or larger hash\n"
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "WARNING: signature samenvatting conflict in message\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "WARNING: signing subkey %s is not cross-certified\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "WARNING: signing subkey %s has an invalid cross-certification\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "public key %s is %lu second newer than the signature\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "public key %s is %lu seconds newer than the signature\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTE: signature key %s expired %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "assuming bad signature from key %s due to an unknown critical bit\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "key %s: no subkey for subkey revocation signature\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "key %s: no subkey for subkey binding signature\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "can't put notation data into v3 (PGP 2.x style) signatures\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5667,22 +5656,22 @@ msgstr ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "checking created signature failed: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature from: “%s”\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5690,48 +5679,48 @@ msgstr ""
 "WARNING: forcing samenvattings algorithm %s (%d) violates recipient "
 "preferences\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "signing:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s encryption will be used\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "key is not flagged as insecure - can't use it with the faked RNG!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "skipped “%s”: duplicated\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "skipped “%s”: %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "skipped: secret key already present\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "this is a PGP generated Elgamal key which is not secure for signatures!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, type %d: write failed: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5740,341 +5729,341 @@ msgstr ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use “gpg --import-ownertrust” to restore them)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "error in ‘%s’: %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "line too long"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "colon missing"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "invalid fingerprint"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "ownertrust value missing"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "error finding trust record in ‘%s’: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "read error in ‘%s’: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync failed: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek failed: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "trustdb transaction too large\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "can't access ‘%s’: %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: directory does not exist!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "can't create lock for ‘%s’\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "can't lock ‘%s’\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: failed to create version record: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: invalid trustdb created\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb created\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTE: trustdb not writable\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: invalid trustdb\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: failed to create hashtable: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error updating version record: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error reading version record: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error writing version record: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek failed: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: not a trustdb file\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error reading free record: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error writing dir record: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: failed to zero a record: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: failed to append a record: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "the trustdb is corrupted; please run “gpg --fix-trustdb”.\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "can't handle text lines longer than %d characters\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "input line longer than %d characters\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "‘%s’ is not a valid long keyID\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "key %s: accepted as trusted key\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "key %s occurs more than once in the trustdb\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "key %s: no public key for trusted key - skipped\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "key %s marked as ultimately trusted\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req type %d: read failed: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "trust record %lu is not of requested type %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "using %s trust model\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[ revoked]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[ expired]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[ unknown]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[  undef ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[marginal]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[  full  ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[ultimate]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "undefined"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "never"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "full"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "ultimate"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "no need for a trustdb check\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "next trustdb check due at %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "no need for a trustdb check with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "no need for a trustdb update with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "public key %s not found: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "please do a --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "checking the trustdb\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d keys processed (%d validity counts cleared)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "no ultimately trusted keys found\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "public key of ultimately trusted key %s not found\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "unable to update trustdb version record: write failed: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6089,301 +6078,313 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "input line %u too long or missing LF\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "general error"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "unknown packet type"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "unknown version"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "unknown pubkey algorithm"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "unknown samenvattings algorithm"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "bad public key"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "bad secret key"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "bad signature"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "checksum error"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "bad passphrase"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "public key not found"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "unknown versleutelalgoritme"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "can't open the keyring"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "invalid packet"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "invalid armor"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "no such user id"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "secret key not available"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "wrong secret key used"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "not supported"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "bad key"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "file read error"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "file write error"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "unknown compress algorithm"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "file open error"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "file create error"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "invalid passphrase"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "unimplemented pubkey algorithm"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "unimplemented versleutelalgoritme"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "unknown signature class"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "trust database error"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "bad MPI"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "resource limit"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "invalid keyring"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "bad certificate"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "malformed user id"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "file close error"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "file rename error"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "file delete error"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "unexpected data"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "timestamp conflict"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "unusable pubkey algorithm"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "file exists"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "weak key"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "invalid argument"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "bad URI"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "unsupported URI"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "network error"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "not encrypted"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "not processed"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "unusable public key"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "unusable secret key"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "keyserver error"
 
-#: util/errors.c:109
+#: util/errors.c:107
 msgid "canceled"
 msgstr "canceled"
 
-#: util/errors.c:110
+#: util/errors.c:108
 msgid "no card"
 msgstr "no card"
 
-#: util/errors.c:111
+#: util/errors.c:109
 msgid "no data"
 msgstr "no data"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr "ERROR: "
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr "WARNING: "
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... this is a bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "you found a bug ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "yes|ja"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "yYjJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "nee"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "stoppen"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr "okay|okay"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr "cancel|cancel"
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "WARNING: using insecure memory!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "please see http://www.gnupg.org/faq.html for more information\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operation is not possible without initialized secure memory\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(you may have used the wrong program for this task)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "can't put notation data into v3 (PGP 2.x style) signatures\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
diff --git a/po/pl.po b/po/pl.po
index 617bcd724..75cb04ccc 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -24,93 +24,93 @@ msgstr ""
 "sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c g10/pubkey-"
 "enc.c\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "nie mo�na wygenerowa� liczby pierwszej kr�tszej od %d bit�w\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "nie mo�na wygenerowa� liczby pierwszej kr�tszej od %d bit�w\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "modu� gromadzenia entropii nie zosta� wykryty\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nie mo�na sprawdzi� ,,%s'': %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ",,%s'' nie jest zwyk�ym plikiem - zostaje pomini�ty\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "uwaga: plik random_seed jest pusty\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "OSTRZE�ENIE: niew�a�ciwy rozmiar pliku random_seed - nie zostanie u�yty\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nie mo�na odczyta� ,,%s'': %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nie mo�na zapisa� ,,%s'': %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nie mo�na zamkn�� ,,%s'': %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "OSTRZE�ENIE: u�ywany generator liczb losowych\n"
 "nie jest kryptograficznie bezpieczny!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -124,7 +124,7 @@ msgstr ""
 "JAKIEKOLWIEK DANE GENEROWANE PRZEZ TEN PROGRAM NIE NADAJ� SI� DO \n"
 "NORMALNEGO U�YTKU I NIE ZAPEWNIAJ� BEZPIECZE�STWA!!\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -137,7 +137,7 @@ msgstr ""
 "tworzenia liczb losowych.\n"
 "\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -149,62 +149,62 @@ msgstr ""
 "Prosz� kontynuowa� inne dzia�ania aby system m�g� zebra� odpowiedni�\n"
 "ilo�� entropii do ich wygenerowania (brakuje %d bajt�w).\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -212,366 +212,371 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "b��d odczytu bloku kluczy: %s\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 #, fuzzy
 msgid "key already exists\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 #, fuzzy
 msgid "generating new key\n"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "opakowanie: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "niepoprawny nag��wek opakowania: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "nag��wek opakowania: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "niew�a�ciwy nag��wek dokumentu z podpisem na ko�cu\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "nag��wek opakowania: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "zagnie�d�one podpisy na ko�cu dokumentu\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "nieoczekiwane opakowanie:"
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "niepoprawne oznaczenie linii minusami: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "niew�a�ciwy znak formatu radix64: ,,%02x'', zosta� pomini�ty\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "przewczesny koniec pliku (brak CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "przedwczesny koniec pliku (w CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "b��d formatu CRC\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "B��d sumy CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "b��d w linii ko�cz�cej\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n"
 "przek�amanie wprowadzone przez serwer pocztowy\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "brak klucza prywatnego"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 #, fuzzy
 msgid "male"
 msgstr "w�kl"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "female"
 msgstr "w�kl"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "unspecified"
 msgstr "nie podano przyczyny"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 #, fuzzy
 msgid "not forced"
 msgstr "nie zosta� przetworzony"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizacja ustawie� klucza"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Odcisk klucza:"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -579,470 +584,470 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nieznany algorytm ochrony\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "show admin commands"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "list all available data"
 msgstr "Klucz dost�pny w: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the login name"
 msgstr "zmiana daty wa�no�ci klucza"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 #, fuzzy
 msgid "generate new keys"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "brak klucza prywatnego"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Powt�rz has�o: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "b��d odczytu bloku kluczy: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(chyba, �e klucz zostaje wybrany przez podanie odcisku)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "bez opcji \"--yes\" nie dzia�a w trybie wsadowym\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Usun�� ten klucz ze zbioru? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "To jest klucz tajny! - czy na pewno go usun��? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "informacja o zaufaniu dla w�a�ciciela klucza zosta�a wymazana\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby go usun�� nalezy najpierw u�y� opcji \"--delete-secret-key\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "ustawiony tryb S2K nie pozwala u�y� pakietu ESK dla szyfru symetrycznego\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "szyfrem %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE�ENIE: plik ,,%s'' jest pusty\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na szyfrowa� dla kluczy RSA kr�tszych od 2048 bit�w\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "odczyt z '%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "nie mo�na u�y� szyfru IDEA z wszystkimi kluczami dla kt�rych szyfrujesz.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "wymuszone u�ycie kompresji %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dane zaszyfrowano za pomoc� %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "OSTRZE�ENIE: wiadomo�� by�a szyfrowana kluczem s�abym szyfru symetrycznego.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "problem podczas obr�bki pakietu szyfrowego\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "odwo�ania do zewn�trznych program�w s� wy��czone\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "nieszczelne uprawnienia ustawie� - wo�anie zewn�trznych program�w wy��czone\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "platforma wymaga u�ycia plik�w tymczasowych do wo�ania zewn�trznych "
 "program�w\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "nie mo�na wykona� %s ,,%s'': %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nie mo�na wykona� %s ,,%s'': %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "b��d systemu podczas wo�ania programu zewn�trznego: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "nienaturalne zako�czenie pracy zewn�trznego programu\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "nie mo�na uruchomi� zewn�trznego programu\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "nie mo�na odczyta� odpowiedzi programu zewn�trznego: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� tymczasowego katalogu ,,%s'': %s.\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "brak kluczy uniewa�niaj�cych dla ,,%s''\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "bezu�yteczny klucz prywatny"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "klucz %08lX: nie jest chroniony - pomini�ty\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "klucz %08lX: klucz PGP 2.x - pomini�ty\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "klucz %08lX: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "OSTRZE�ENIE: klucz prywatny %08lX nie ma prostej sumy kontrolnej SK.\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1050,128 +1055,128 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "z�o�enie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "od�wie�enie wszystkich kluczy z serwera"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1181,51 +1186,51 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - bez)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plik�w"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1233,7 +1238,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1254,15 +1259,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1272,7 +1277,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1280,73 +1285,73 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1354,21 +1359,21 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1376,562 +1381,562 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "okazanie, w kt�rym zbiorze znajduje si� dany klucz"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "modu� szyfru ,,%s'' nie zosta� za�adowany z powodu niebezpiecznych praw "
 "dost�pu\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nie mo�na ustawi� �cie�ki program�w wykonywalnych na %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na sk�ada� tylko podpisy oddzielne lub do��czone do "
 "tekstu\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 nie mo�na jednocze�nie szyfrowa� i podpisywa�\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "w trybie --pgp2 trzeba u�ywa� plik�w a nie potok�w.\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "szyfrowanie wiadomo�ci w trybie --pgp2 wymaga modu�u szyfru IDEA\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy minimalny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "OSTRZE�ENIE: podano adresat�w (-r) w dzia�aniu kt�re ich nie dotyczy\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[brak identyfikatora u�ytkownika]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %08lX.\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "brak prywatnego odpowiednika podklucza publicznego %08lX - pomini�ty\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "pobieranie kluczy z tego zbioru"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "nie traktowa� konfliktu datownik�w jako b��du"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpgv [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1939,7 +1944,7 @@ msgstr ""
 "Sk�adnia: gpgm [opcje] [pliki]\n"
 "Sprawdzanie podpis�w ze znanych zaufanych kluczy\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1950,7 +1955,7 @@ msgstr ""
 "zaufania, i nie ma to nic wsp�lnego z tworzon� automatycznie sieci�\n"
 "certyfikat�w."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1962,18 +1967,18 @@ msgstr ""
 "tajne. Odpowiedz ,,tak'', je�li chcesz okre�li� ten klucz jako klucz\n"
 "do kt�rego masz absolutne zaufanie.\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Je�li mimo wszystko chcesz u�y� tego klucza, klucza, co do kt�rego nie ma\n"
 "�adnej pewno�ci do kogo nale�y, odpowiedz ,,tak''."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Podaj adresat�w tej wiadomo�ci."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1987,7 +1992,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1998,16 +2003,16 @@ msgstr ""
 "si�\n"
 "najpierw skonsultowa� z ekspertem od bezpiecze�stwa. "
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Wprowad� rozmiar klucza"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Odpowied� \"tak\" lub \"nie\"."
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2019,20 +2024,20 @@ msgstr ""
 "w�a�ciwej obs�ugi b��d�w - system pr�buje interpretowa� podan� warto��\n"
 "jako okres."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Nazwa w�a�ciciela klucza."
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "prosz� wprowadzi� opcjonalny ale wysoce doradzany adres e-mail"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Prosz� wprowadzi� opcjonalny komentarz"
 
 # OSTRZE�ENIE: nic nie zosta�o wyeksportowane!
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2046,11 +2051,11 @@ msgstr ""
 "O aby kontynuowa� tworzenie klucza.\n"
 "Q aby zrezygnowa� z tworzenia klucza."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Je�li ma zosta� wygenerowany podklucz, nale�y odpowiedzie� \"tak\"."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2121,12 +2126,12 @@ msgstr ""
 "\n"
 "Je�li nie wiesz co odpowiedzie�, podaj \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Odpowiedz \"tak\", aby podpisa� WSZYSTKIE identyfikatory u�ytkownika."
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2134,11 +2139,11 @@ msgstr ""
 "Aby skasowa� ten identyfikator u�ytkownika (co wi��e si� ze utrat�\n"
 "wszystkich jego po�wiadcze�!) nale�y odpowiedzie� ,,tak''."
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Aby skasowa� podklucz nale�y odpowiedzie� \"tak\"."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2148,7 +2153,7 @@ msgstr ""
 "poniewa� mo�e by� wa�ny dla zestawienia po�aczenia zaufania do klucza\n"
 "kt�rym go z�o�ono lub do innego klucza nim po�wiadczonego."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2161,13 +2166,13 @@ msgstr ""
 "w momencie uzyskania tego klucza mo�e pojawi� si� �cie�ka zaufania\n"
 "pomi�dzy tym a innym, ju� po�wiadczonym kluczem."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Ten podpis jest niepoprawny. Mo�na usuni�� go ze zbioru kluczy."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2181,7 +2186,7 @@ msgstr ""
 "klucza nim samym z jakich� przyczyn nie jest poprawny, i klucz jest\n"
 "drugi raz podpisany w ten sam spos�b."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2191,30 +2196,30 @@ msgstr ""
 "ustawienia. Data na odpowiednich podpisach zostane przesuni�ta do przodu o\n"
 "jedn� sekund�. \n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Prosz� powr�trzy� has�o, aby upewni� si� �e nie by�o pomy�ki."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Podaj nazw� pliku kt�rego dotyczy ten podpis"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Je�li mo�na nadpisa� ten plik, nale�y odpowiedzie� ,,tak''"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
 "Nazwa pliku. Naci�ni�cie ENTER potwierdzi nazw� domy�ln� (w nawiasach)."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2241,7 +2246,7 @@ msgstr ""
 "      Identyfikator u�ytkownika (najcz�ciej adres e-mail przesta� by� \n"
 "      poprawny.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2251,540 +2256,540 @@ msgstr ""
 "uniewa�nienia. Opis powinien byc zwi�z�y. \n"
 "Pusta linia ko�czy wprowadzanie tekstu.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Pomoc niedost�pna"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o ,,%s''"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "bezu�yteczny klucz prywatny"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pomini�ty\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Og�em przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "   pomini�tych nowych kluczy: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "         do��czono do zbioru: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikator�w: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa�nie� kluczy: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "      nie w��czono do zbioru: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "klucz %08lX: podklucz uszkodzony przez serwer zosta� naprawiony\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "klucz %08lX: przyj�to identyfikator nie podpisany nim samym ,,%s''\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to mo�e by� spowodowane brakiem podpisu klucza nim samym\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "klucz %08lX: klucz publiczny ,,%s'' wczytano do zbioru\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "klucz %08lX: nie zgadza si� z lokaln� kopi�\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy identyfikator u�ytkownika\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podpis\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podklucz\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podkluczy\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klucz %08lX: ,,%s'' bez zmian\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "klucz %08lX: klucz tajny z ustawionym szyfrem %d - pomini�ty\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "brak domy�lego zbioru kluczy tajnych: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego kt�rego dotyczy wczytany certyfikat\n"
 "              uniwa�nienia\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "klucz %08lX: ,,%s'' certyfikat uniewa�nienia zosta� ju� wczytany\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "klucz %08lX: algorytm asymetryczny \"%s\" nie jest obs�ugiwany\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klucz %08lX: nie obs�ugiwany algorytm asymetryczny\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "klucz %08lX: usuni�to wielokrotne dowi�zanie podklucza\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klucz %08lX: nieoprawne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "klucz %08lX: usuni�to wielokrotne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "klucz %08lX: podpis nieeksportowalny (klasy %02x) - pomini�ty\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %08lX: pomini�to certyfikat uniewa�nienia umieszczony \n"
 "              w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %08lX: pomini�to -  niepoprawny certyfikat uniewa�nienia: %s\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "klucz %08lX: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "klucz %08lX: pomini�to - nieoczekiwana klasa podpisu (%02x)\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %08lX: do��czono powt�rzony identyfikator u�ytkownika\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewazniony:\n"
 "             zapytanie o uniewa�niaj�cy klucz %08lX w serwerze kluczy\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewa�niony:\n"
 "             brak uniewa�niaj�cego klucza %08lX.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klucz %08lX: dodano bezpo�redni podpis\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "zbi�r kluczy ,,%s'' zosta� utworzony\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "b��d tworzenia `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[uniewa�nienie]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpis�w\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpis�w nie zosta�o sprawdzonych z powodu braku kluczy\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis�w nie sprawdzonych z powodu b��d�w\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "wykryto 1 identyfikator u�ytkownika niepodpisany tym samym kluczem\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2797,63 +2802,63 @@ msgstr ""
 "z r�nych �r�de�, dokumenty potwierdzaj�ce to�samo��, itd.).\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = mam ograniczone zaufanie\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = mam pe�ne zaufanie\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisa�? (t/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr " Nie da si� z�o�y� podpisu.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Identyfikator u�ytkownika ,,%s'' przekroczy� sw�j termin wa�no�ci."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2862,11 +2867,11 @@ msgstr ""
 "Podpis klucza nim samym na ,,%s''\n"
 "jest podpisem z�o�onym przez PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Czy chcesz zamieni� go na podpis OpenPGP? (t/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2875,11 +2880,11 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "przekroczy� dat� wa�no�ci.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Czy chcesz zast�pi� przeterminowany podpis nowym? (t/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2888,56 +2893,56 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "jest podpisem prywatnym (lokalnym).\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Czy chcesz zamieni� go na pe�ny, publiczny, eksportowalny podpis? (t/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" jest ju� lokalnie podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jest ju� podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Czy na pewno chcesz to podpisa�? (t/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Data wa�no�ci tego klucza up�yn�a!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Wa�no�� tego klucza wygasa %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Czy chcesz �eby wa�no�� Twojego podpisu wygasa�a w tej samej chwili? (T/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "W trybie --pgp2 nie mo�na podpisywa� kluczy PGP 2.x podpisami OpenPGP.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To uczyni ten klucz nieuzytecznym dla PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2946,32 +2951,32 @@ msgstr ""
 "Jak dok�adnie zosta�a przez Ciebie sprawdzona to�samo�� tej osoby?\n"
 "Je�li nie wiesz co odpowiedzie�, podaj ,,0''.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nie odpowiem na to pytanie. %s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) W og�le nie.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Pobie�nie.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Bardzo dok�adnie.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Tw�j wyb�r (,,?'' podaje wi�cej informacji): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2980,99 +2985,99 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "To b�dzie podpis klucza nim samym.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika nie zosta�a w og�le sprawdzona.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a sprawdzona pobie�nie.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3080,11 +3085,11 @@ msgstr ""
 "Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3092,209 +3097,209 @@ msgstr ""
 "Nie chcesz has�a - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "z�o�enie prywatnego (lokalnego) podpisu na kluczu"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: niepodpisany identyfikator u�ytkownika\n"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "dodanie zdj�cia u�ytkownika do klucza"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "add a subkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "wyznaczenie klucza uniewa�niaj�cego"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "oznaczenie identyfikatora u�ytkownika jako g��wnego"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i prywatnych"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawie�"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "zmiana has�a klucza"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "uniewa�nienie identyfikatora u�ytkownika"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "enable key"
 msgstr "w��czy� klucz do u�ycia"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "disable key"
 msgstr "wy��czy� klucz z u�ycia"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "okazanie identyfikatora - zdj�cia"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "b��d odczytu bloku klucza tajnego '%s': %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3302,242 +3307,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "Klucz uniewa�niony."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nieznana klasa podpisu"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Czy na pewno uniewa�ni� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ustawienie opcji klucza"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Czy na pewno usaktualni� ustawienia? "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "Klucz nie zosta� zmieniony wi�c zapis zmian nie jest konieczny.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Skr�t: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr "Adnotacja: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Klucze PGP 2.x nie zawieraj� opisu ustawie�.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (poufne)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3545,19 +3550,19 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "data"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3566,7 +3571,7 @@ msgstr ""
 "             jako g��wny. Wykonanie tego polecenie mo�e wi�c spowodowa�\n"
 "             wy�wietlanie innego identyfikatora jako domy�lnego g��wnego.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3575,74 +3580,74 @@ msgstr ""
 "OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
 "             niekt�re wersje przestan� go rozumie�.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie mo�na doda� zdj�cia.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "niepoprawny"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3652,372 +3657,372 @@ msgstr ""
 "             uniewa�niaj�cego, spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             go rozumie�.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie mo�na wyznaczy� klucza uniewa�niaj�cego.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klucza PGP 2.x nie mo�na wyznaczy� jako uniewa�niaj�cego\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nie mo�na wyznaczu� klucza do uniewa�niania jego samego\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony kluczem uniewa�niaj�cym!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "OSTRZE�ENIE: nie mo�na cofn�� wyznaczenia klucza jako uniewa�niaj�cego!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Czy na pewno chcesz wyznaczy� ten klucz jako uniewa�niaj�cy? (t/N): "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Prosz� wybra� tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "OSTRZE�ENIE: podklucz podpisuj�cy %08lX nie jest skro�nie podpisany\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pomini�ty\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Adnotacje podpisu: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Nadpisa� (t/N)? "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podpisany przez %08lX w %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "OSTRZE�ENIE: identyfikator u�ytkownika podpisany za %d sekund (w "
 "przysz�o�ci)\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zdj�cie w formacie %s, rozmiar %ld bajt�w, klucz 0x%08lX (id %d).\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "ustawienie %c%lu powtarza si�\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "zapis podpisu bezpo�redniego\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmair klucza zaokr�glony do %u bit�w\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 #, fuzzy
 msgid "Sign"
 msgstr "podpis"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 #, fuzzy
 msgid "Encrypt"
 msgstr "szyfrowanie danych"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) Para kluczy dla algorytm�w DSA i ElGamala (domy�lne)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Para kluczy dla DSA b�dzie mia�a 1024 bity d�ugo�ci.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (1024) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bit�w.\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4033,7 +4038,7 @@ msgstr ""
 "      <n>m = termin wa�no�ci klucza up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci klucza up�ywa za n lat\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4049,40 +4054,40 @@ msgstr ""
 "      <n>m = termin wa�no�ci podpisu up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci podpisu up�ywa za n lat\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Okres wa�no�ci podpisu? (0) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s nie ma daty wa�no�ci\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s nie ma daty wa�no�ci\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s traci wa�no��: %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4090,12 +4095,12 @@ msgstr ""
 "Tw�j system nie potrafi pokaza� daty po roku 2038.\n"
 "Niemniej daty do roku 2106 b�d� poprawnie obs�ugiwane.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Czy wszystko si� zgadza (t/n)? "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 #, fuzzy
 msgid ""
 "\n"
@@ -4112,44 +4117,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "Imi� i nazwisko musz� mie� conajmniej 5 znak�w d�ugo�ci.\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4160,7 +4165,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Nie nalezy umieszcza� adresu poczty elektronicznej w polu nazwiska czy\n"
@@ -4177,37 +4182,37 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj��? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, przej�� (D)alej,\n"
 "czy (W)yj�� z programu ? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 "Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4219,7 +4224,7 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4235,50 +4240,50 @@ msgstr ""
 "ilo�ci\n"
 "entropii.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4287,12 +4292,12 @@ msgstr ""
 "Ten klucz nie mo�e by� wykorzystany do szyfrowania. Komend� \"--edit-key\"\n"
 "mo�na doda� do niego podklucz szyfruj�cy.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4300,7 +4305,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4308,696 +4313,696 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzy�? "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "nigdy     "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Krytyczny regulamin podpisu: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Regulamin podpisu: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Krytyczne adnotacje podpisu: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Adnotacje podpisu: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Zbi�r kluczy"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "      Odcisk podklucza:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr " Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "       Odcisk podklucza:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Odcisk klucza ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "OSTRZE�ENIE: Istniej� dwa pliki z poufnymi informacjami.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozosta� bez zmian\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s zosta� utworzony\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "sprawdzanie zbioru kluczy ,,%s''\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kluczy (%lu podpis�w)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kluczy (%lu podpis�w)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbi�r kluczy utworzony\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 #, fuzzy
 msgid "disabled"
 msgstr "wy�kl"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "b��d serwera kluczy"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "b��d serwera kluczy"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, 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:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "klucz sesyjny zaszyfrowany %s\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zaszyfrowano kluczem %s, o numerze %08lX\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zaszyfrowane za pomoc� %lu hase�\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "zaszyfrowane jednym has�em\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "przyjmuj�c �e dane zosta�y zaszyfrowane za pomoc� %s\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "OSTRZE�ENIE: wiadomo�� nie by�a zabezpieczona przed manipulacj�\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 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:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nie mo�na obs�uzy� tych wielokrotnych podpis�w\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "Klucz dost�pny w: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Przeterminowany podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "binarny"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "nieznany"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 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:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nie mo�na wy��czy� zrzut�w pami�ci: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "naniesienie poprawek bazy zaufania nie powiod�o si�: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algorytm szyfruj�cy nie jest zaimplementowany"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "modu� szyfru IDEA nie jest dost�pny\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = potrzebuj� wi�cej informacji\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d jest przestarza�� opcj� ,,%s''\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "w jej miejsce nale�y u�y� ,,%s%s''\"\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "Nieskompresowany"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nieskompresowany"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ta wiadomo�� mo�e nie da� si� odczyta� za pomoc� %s\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Plik ,,%s'' ju� istnieje. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Nadpisa� (t/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nieznana ko�c�wka nazwy\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Nazwa pliku"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "zapisywanie na wyj�cie standardowe\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "przyj�to obecno�� podpisanych danych w '%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "nowy plik ustawie� ,,%s'' zosta� utworzony\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, 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"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: katalog utworzony\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "OSTRZE�ENIE: symetrycznie zaszyfrowany klucz sesyjny mo�e nie by� "
 "bezpieczny\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem z agentem - zostaje wy��czony\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (podklucz %08lX)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5008,28 +5013,28 @@ msgstr ""
 "\"%.*s\".\n"
 "Klucz o d�ugo�ci %u bit�w, typ %s, numer %08lX, stworzony %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Powt�rzone has�o\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Has�o\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "pytanie o has�o nie dzia�a w trybie wsadowym\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Podaj has�o: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5039,21 +5044,21 @@ msgstr ""
 "Musisz poda� has�o aby odbezpieczy� klucz prywatny u�ytkownika:\n"
 "\""
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ugo�� %u bit�w, typ %s, numer %08lX, stworzony %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Powt�rz has�o: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5067,162 +5072,162 @@ msgstr ""
 "publicznym. Je�li b�dzie du�y, powi�kszy to tak�e rozmiar Twojego klucza!\n"
 "Dobry rozmiar to oko�o 240 na 288 pikseli.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Nazwa pliku ze zdj�ciem w formacie JPEG: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nie mo�na otworzy� pliku: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr ",,%s'' nie jest plikiem JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Czy zdj�cie jest w porz�dku? (t/N/w) "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "nie mo�na wy�wietli� zdj�cia!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "nie podano przyczyny"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "klucz zosta� zast�piony"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "klucz zosta� skompromitowany"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "klucz nie jest ju� u�ywany"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "identyfikator u�ytkownika przesta� by� poprawny"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "pow�d uniewa�nienia: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "komentarz do uniewa�nienia: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMwWpP"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Brak warto�ci zaufania dla:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                        alias \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Ten klucz prawdopodobnie nale�y do tej osoby.\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = nie wiem\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = NIE ufam mu\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = ufam absolutnie\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = powr�t do g��wnego menu\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " p = pomini�cie klucza\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " w = wyj�cie\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Twoja decyzja? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Czy na pewno chcesz przypisa� absolutne zaufanie temu kluczowi? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certyfikaty prowadz�ce do ostatecznie zaufanego klucza:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%08lX: Nie ma pewno�ci co do to�samo�ci w�a�ciciela klucza.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%08lX: Nie ma pewno�ci co do to�samo�ci w�a�ciciela klucza.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Ten klucz prawdopodobnie nale�y do tej osoby.\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Ten klucz nale�y do nas\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5234,113 +5239,113 @@ msgstr ""
 "mo�esz odpowiedzie� ,,tak'' na nast�pne pytanie.\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "U�y� tego klucza pomimo to? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewa�niony\n"
 "             (brak klucza uniewa�niaj�cego aby to sprawdzi�)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony kluczem uniewa�niaj�cym!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "             To mo�e oznacza� �e podpis jest fa�szerstwem.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten podklucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Uwaga: Ten klucz zosta� wy��czony z u�ytku\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "OSTRZE�ENIE: Ten klucz nie jest po�wiadczony zaufanym podpisem!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "             Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a podpis.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "OSTRZE�ENIE: NIE UFAMY temu kluczowi!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "             Ten podpis prawdopodobnie jest FA�SZYWY.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "OSTRZE�ENIE: Tego klucza nie po�wiadczaj� wystarczaj�co zaufane podpisy!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "             Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a ten "
 "podpis.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pomini�ty: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: pomini�ty: zosta� ju� wybrany w innej opcji\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Nie zosta� podany identyfikatora u�ytkownika (np za pomoc� ,,-r'')\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5348,169 +5353,169 @@ msgstr ""
 "\n"
 "Identyfikator u�ytkownika (pusta linia oznacza koniec): "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u�ytkownika.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "pomini�ty: klucz publiczny ju� jest domy�lnym adresatem\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "Klucz publiczny wy��czony z u�ycia.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "pomini�ty: zosta� ju� wybrany w innej opcji\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: pomini�ty: klucz publiczny wy��czony z u�ytku\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresat�w\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "dane nie zosta�y zapisane; aby to zrobi�, nale�y u�y� opcji \"--output\"\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "b��d tworzenia `%s': %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Podpis oddzielony od danych.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Nazwa pliku danych: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "czytam strumie� standardowego wej�cia\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "brak podpisanych danych\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo�na otworzy� podpisanego pliku ,,%s''\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "adresat anonimowy; sprawdzanie %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, to my jeste�my adresatem anonimowym.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "stary, nie obs�ugiwany algorytm szyfrowania klucza sesyjnego\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algorytm szyfruj�cy %d%s jest nieznany, lub zosta� wy��czony\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "UWAGA: brak algorytmu szyfruj�cego %d w ustawieniach\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "UWAGA: klucz zosta� uniewa�niony"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "wywo�anie funkcji build_packet nie powiod�o si�: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Zostanie uniewa�niony przez:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(to jest czu�y klucz uniewazniaj�cy)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "wymuszono opakowanie ASCII wyniku.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "wywo�anie funkcji make_keysig_packet nie powiod�o si�: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Certyfikat uniewa�nienia zosta� utworzony.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "brak kluczy uniewa�niaj�cych dla ,,%s''\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "nieznany algorytm ochrony\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "UWAGA: Ten klucz nie jest chroniony!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5534,122 +5539,122 @@ msgstr ""
 "komputer�w mog� zachowa� tre�� wydruku i udost�pni� j� osobom "
 "nieupowa�nionym.\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Prawdopodobnie chcesz tu wybra� %d)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Wprowad� opis (nieobowi�zkowy) i zako�cz go pust� lini�:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Pow�d uniewa�nienia: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(nie podano)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Informacje poprawne? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "tajne cz�ci klucza s� niedost�pne\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Niepoprawne has�o; prosz� spr�bowa� ponownie"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "OSTRZE�ENIE: Wykryto klucz s�aby algorytmu - nale�y ponownie zmieni� has�o.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "tworzenie przestarza�ej 16-bitowej sumy kontrolnej dla ochrony klucza\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "wygenerowano s�aby klucz - operacja zostaje powt�rzona\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "brak mo�liwo�ci generacji dobrego klucza dla szyfru symetrycznego;\n"
 "operacja by�a powtarzana %d razy!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "OSTRZE�ENIE: konflikt skr�t�w podpis�w w wiadomo�ci\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "OSTRZE�ENIE: podklucz podpisuj�cy %08lX nie jest skro�nie podpisany\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "OSTRZE�ENIE: podklucz podpisuj�cy %08lX jest niepoprawnie skro�nie "
 "podpisany\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "klucz publiczny %08lX jest o %lu sekund� m�odszy od podpisu\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "klucz publiczny %08lX jest o %lu sekund(y) m�odszy od podpisu\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5657,7 +5662,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5665,55 +5670,36 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "UWAGA: klucz podpisuj�cy %08lX przekroczy� dat� wa�no�ci %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "podpis z�o�ony kluczem %08lX uznany za niewa�ny z powodu nieznanego bitu "
 "krytycznego\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "klucz %08lX: brak podklucza dowi�zywanego podpisem\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "nie mo�na umie�ci� adnotacji w podpisach sk�adanych kluczami PGP 2.x\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"nie mo�na umie�ci� adnotacji w podpisach kluczy sk�adanych kluczami PGP 2.x\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "OSTRZE�ENIE: nie mo�na rozwin�� %% w URL adnotacji (jest zbyt d�ugi).\n"
 "             U�yty zostanie nie rozwini�ty.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"nie mo�na umie�ci� URL-a regulaminu w podpisach sk�adanych kluczami PGP 2.x\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"w podpisach dla PGP 2.x nie mo�na umie�ci� URL-a do regulaminu podpisu\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5721,7 +5707,7 @@ msgstr ""
 "OSTRZE�ENIE: nie mo�na rozwin�� znacznik�w %% w URL regulaminu\n"
 "           (jest zbyt d�ugi). U�yty zostanie nie rozwini�ty.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5730,74 +5716,74 @@ msgstr ""
 "OSTRZE�ENIE: nie mo�na rozwin�� znacznik�w %% w URL regulaminu\n"
 "           (jest zbyt d�ugi). U�yty zostanie nie rozwini�ty.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis z�o�ony przez: ,,%s''\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "kluczami PGP 2 w trybie --pgp2 mo�na podpisywa� tylko do oddzielonych "
 "podpis�w\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 mo�na podpisywa� tylko za pomoc� kluczy z wersji 2.x\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie u�yty szyfr %s\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "klucz nie jest oznaczony jako niepewny - nie mo�na go u�y� z atrap� \n"
 "generatora liczb losowych!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "pomini�ty ,,%s'': duplikat\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "pomini�ty ,,%s'': %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "pomini�ty ,,%s'': wygenerowany przez PGP klucz dla algorytmu ElGamala,\n"
 "podpisy sk�adane tym kluczem nie zapewniaj� bezpiecze�stwa!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5806,349 +5792,349 @@ msgstr ""
 "# Lista przypisanych warto�ci zaufania, stworzona %s\n"
 "# (u�yj \"gpg --import-ownertrust\" aby j� wczyta�)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "linia zbyt d�uga\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "wczytanie warto��i zaufania"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "b��d podczas odczytu zapisu warto�ci zaufania: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "b��d odczytu: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "baza zaufania: synchronizacja nie powiod�a si� %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "baza zaufania, wpis %lu: funkcja lseek() nie powiod�a si�: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "baza zaufania, wpis %lu: zapis nie powi�d� si� (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "zbyt du�e zlecenie dla bazy zaufania\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "nie mo�na zamkn�� ,,%s'': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: stworzenie zapisu o wersji nie powiod�o si�: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: baza zaufania utworzona\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "UWAGA: nie mo�na zapisywa� bazy zaufania\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: tworzenie tablicy skr�t�w nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: b��d przy uaktualnianiu numeru wersji: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: b��d odczytu numeru wersji: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: b��d zapisu numeru wersji: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "baza zaufania: funkcja lseek() zawiod�a: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: to nie jest plik bazy zaufania\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: wpis wersji z numerem %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: niew�a�ciwa wersja pliku %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: zerowanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: dopisanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Baza zaufania jest uszkodzona; prosz� uruchomi� ,,gpg --fix-trustdb''.\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nie mo�na obs�u�y� linii tekstu d�u�szej ni� %d znak�w\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linia d�u�sza ni� %d znak�w\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr ",,%s'' nie jest poprawnym d�ugim numerem klucza\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "klucz %08lX: zaakceptowany jako klucz zaufany\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "klucz %08lX jest wpisany wi�cej ni� raz w bazie zaufania\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego dla zaufanego klucza - pomini�ty\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "klucz zosta� oznaczony jako obdarzony absolutnym zaufaniem.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: odczyt nie powi�d� si�: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "wpis zaufania %lu jest typu innego ni� poszukiwany %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[uniewa�niony]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[przeterminowany]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nieznany"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "nigdy     "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "klucz publiczny %08lX nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "nale�y uruchomi� gpg z opcj� ,,--check-trustdb''\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "brak absolutnie zaufanych kluczy\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 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:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6163,309 +6149,327 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linia wej�cia %u zbyt d�uga lub brak znaku LF\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "b��d og�lny"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "nieznany typ pakietu"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "nieznana wersja"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "nieznany algorytm asymetryczny"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "nieznany algorytm skr�tu"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "niepoprawny klucz publiczny"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "niepoprawny klucz prywatny"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "niepoprawny podpis"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "b��d sumy kontrolnej"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "niepoprawne has�o"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "brak klucza publicznego"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "nieznany algorytm szyfruj�cy"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "otwarcie zbioru kluczy jest niemo�liwe"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "niepoprawny pakiet"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "b��d w opakowaniu ASCII"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "brak takiego identyfikatora u�ytkownika."
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "brak klucza prywatnego"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "zosta� u�yty niew�a�ciwy klucz prywatny"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "nie jest obs�ugiwany"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "niepoprawny klucz"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "b��d przy odczycie pliku"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "b��d przy zapisie pliku"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "nieznany algorytm kompresji"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "b��d przy otwieraniu pliku."
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "b��d przy tworzeniu pliku"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "niepoprawne d�ugie has�o"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "algorytm szyfrowania z kluczem publicznym nie jest zaimplementowany"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "algorytm szyfruj�cy nie jest zaimplementowany"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "nieznana klasa podpisu"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "b��d w bazie zaufania"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "b��d MPI"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "ograniczenie zasob�w"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "b��d w zbiorze kluczy"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "niepoprawny certyfikat"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "b��d formatu identyfikatora u�ytkownika"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "b��d przy zamykaniu pliku"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "b��d przy zmianie nazwy pliku"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "b��d przy usuwaniu pliku"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "nieoczekiowane dane"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "konflikt datownik�w"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "nieu�yteczny algorytm asymetryczny"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "plik ju� istnieje"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "klucz s�aby"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "b��dny argument"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "niepoprawny URI"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "URI nie jest obs�ugiwany"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "b��d sieci"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "nie zaszyfrowany"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "nie zosta� przetworzony"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "bezu�yteczny klucz publiczny"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "bezu�yteczny klucz prywatny"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "b��d serwera kluczy"
 
-#: util/errors.c:109
+#: util/errors.c:107
 #, fuzzy
 msgid "canceled"
 msgstr "Anuluj"
 
-#: util/errors.c:110
+#: util/errors.c:108
 #, fuzzy
 msgid "no card"
 msgstr "nie zaszyfrowany"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "brak podpisanych danych\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... to jest b��d programu (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "tak"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "tT"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "nie"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "wyj�cie"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "wW"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 #, fuzzy
 msgid "cC"
 msgstr "l"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "OSTRZE�ENIE: nie mo�na zabezpieczy� u�ywanej pami�ci!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "obja�nienie mo�na przeczyta� tutaj: http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "bez zabezpieczenia pami�ci nie mo�na wykona� tej operacji\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "nie mo�na umie�ci� adnotacji w podpisach sk�adanych kluczami PGP 2.x\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "nie mo�na umie�ci� adnotacji w podpisach kluczy sk�adanych kluczami PGP 2."
+#~ "x\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "nie mo�na umie�ci� URL-a regulaminu w podpisach sk�adanych kluczami PGP 2."
+#~ "x\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "w podpisach dla PGP 2.x nie mo�na umie�ci� URL-a do regulaminu podpisu\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr ""
 #~ "Algorytm DSA wymaga u�ycia algorytmu skr�tu daj�cego 160-bitowy wynik.\n"
diff --git a/po/pt.po b/po/pt.po
index 2011d6665..b701ecdee 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -17,91 +17,91 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr ""
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr ""
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "nenhum m�dulo de recolha de entropia detectado\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "imposs�vel 'stat' a `%s': %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n�o � um ficheiro normal - ignorado\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "nota: random_seed est� vazia\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "AVISO: o ficheiro random_seed tem um tamanho inv�lido - n�o utilizado\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "imposs�vel ler `%s': %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "nota: ficheiro random_seed n�o actualizado\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "imposs�vel escrever `%s': %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: a utilizar gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -115,14 +115,14 @@ msgstr ""
 "N�O USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -133,62 +133,62 @@ msgstr ""
 "N�o h� bytes aleat�rios suficientes. Por favor, fa�a outro trabalho para\n"
 "que o sistema possa recolher mais entropia! (S�o necess�rios mais %d bytes)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -196,364 +196,369 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%s' j� comprimido\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "cabe�alho de armadura inv�lido: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "cabe�alho de armadura: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "fim de ficheiro prematuro (sem CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "fim de ficheiro prematuro (no CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "erro na �ltima linha\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caracter \"quoted printable\" na armadura - provavelmente um MTA com bugs "
 "foi usado\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Op��o? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 #, fuzzy
 msgid "Language preferences: "
 msgstr "prefer�ncias actualizadas"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -561,297 +566,297 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita a frase secreta: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a n�o ser que escolha a chave pela sua impress�o digital)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interactivo sem utilizar \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Remover esta chave do porta-chaves?"
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Esta chave � secreta! - apagar de qualquer modo? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "informa��es de 'ownertrust' limpas\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilize a op��o \"--delete-secret-keys\" para a apagar primeiro.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "n�o � poss�vel utilizar o pacote ESK sim�trico devido ao modo S2K\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "%s' j� comprimido\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um ficheiro vazio\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "no modo --pgp2 s� pode cifrar com chaves RSA de 2048 bits ou menos\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "imposs�vel utilizar a cifra IDEA para todas as chaves para que est� a "
 "cifrar.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -860,168 +865,168 @@ msgstr ""
 "ao for�ar o algoritmo de compress�o %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados cifrados com %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi cifrada com uma chave fraca na cifragem sim�trica.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao tratar pacote cifrado\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "%s: erro ao ler registo de vers�o: %s\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, fuzzy, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "%s: erro ao ler registo de vers�o: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 #, fuzzy
 msgid "unable to execute external program\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, fuzzy, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, fuzzy, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "chave secreta n�o utiliz�vel"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o est� protegida - ignorada\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1029,128 +1034,128 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1160,55 +1165,55 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrep�r"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1216,7 +1221,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1236,15 +1241,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1254,7 +1259,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1262,656 +1267,656 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "a extens�o de cifra \"%s\" n�o foi carregada devido �s suas permiss�es "
 "inseguras\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "n�o pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: destinat�rios (-r) dados sem utilizar uma cifra de chave p�blica\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desactivado\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Utilizador n�o encontrado]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chave inv�lida %08lX tornada v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Remover esta chave do porta-chaves?"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informa��es de estado para o\n"
 "descritor de ficheiro DF"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1921,7 +1926,7 @@ msgstr ""
 "terceiros. Precisamos dele implementar a rede de confian�a, que n�o tem\n"
 "nada a ver com a rede de certificados (implicitamente criada)."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1934,20 +1939,20 @@ msgstr ""
 "para\n"
 "que esta chave seja de confian�a absoluta.\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Se voc� quiser usar esta chave, n�o de confian�a, assim mesmo, responda \"sim"
 "\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Digite o ID de utilizador do destinat�rio para quem quer enviar a\n"
 "mensagem."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1961,7 +1966,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1971,16 +1976,16 @@ msgstr ""
 "cifrar.  Este algoritmo s� deve ser utilizado em alguns dom�nios.\n"
 "Por favor consulte primeiro o seu perito em seguran�a."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Insira o tamanho da chave"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"sim\" ou \"n�o\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1992,19 +1997,19 @@ msgstr ""
 "reac��o a erros - o sistema tentar� interpretar o valor dado como um "
 "intervalo."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Digite o nome do possuidor da chave"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "por favor digite um endere�o de email (opcional mas recomendado)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Por favor digite um coment�rio (opcional)"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2018,11 +2023,11 @@ msgstr ""
 "O  para continuar a gera��o da chave.\n"
 "S  para interromper a gera��o da chave."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Responda \"sim\" (ou apenas \"s\") se quiser gerar a subchave."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2094,12 +2099,12 @@ msgstr ""
 "\n"
 "Se n�o sabe qual � a resposta correcta, responda \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Responda \"sim\" se quiser assinar TODOS os IDs de utilizador"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2107,11 +2112,11 @@ msgstr ""
 "Responda \"sim\" se quiser realmente remover este ID de utilizador.\n"
 "Todos os certificados tamb�m ser�o perdidos!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"sim\" se quiser remover a subchave"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2121,7 +2126,7 @@ msgstr ""
 "remover esta assinatura porque ela pode ser importante para estabelecer\n"
 "uma conex�o de confian�a � chave ou a outra chave certificada por esta."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2133,13 +2138,13 @@ msgstr ""
 "porque a chave desta assinatura pode estabelecer uma conex�o de confian�a\n"
 "atrav�s de outra chave j� certificada."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "A assinatura n�o � v�lida. Faz sentido remov�-la do seu porta-chaves."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2152,7 +2157,7 @@ msgstr ""
 "n�o consiga mais usar esta chave. Fa�a isto apenas se por alguma\n"
 "raz�o esta auto-assinatura n�o for v�lida e h� uma segunda dispon�vel."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2163,23 +2168,23 @@ msgstr ""
 "O 'timestamp' de todas as auto-assinaturas afectuadas ser� avan�ado\n"
 "em um segundo.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor digite a frase secreta \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Por favor repita a frase secreta, para ter certeza do que digitou."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "D� o nome para o ficheiro ao qual a assinatura se aplica"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"sim\" se quiser escrever por cima do ficheiro"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2188,7 +2193,7 @@ msgstr ""
 "RETURN\n"
 "o ficheiro por omiss�o (que � mostrado entre par�nteses) ser� utilizado."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2217,7 +2222,7 @@ msgstr ""
 "     n�o deve ser mais utilizado; normalmente utilizada para indicar\n"
 "     que um endere�o de email � inv�lido.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2227,536 +2232,536 @@ msgstr ""
 "este certificado de revoga��o. Por favor mantenha este texto conciso.\n"
 "Uma linha vazia termina o texto.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr ""
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "chave secreta n�o utiliz�vel"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ignorei novas chaves: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de utilizadores: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        n�o importadas: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" n�o modificada\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta com cifra inv�lida %d - ignorada\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica n�o suportado no utilizador \"%s\"\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida do utilizador \"%s\"\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: apagada liga��o m�ltipla de subchave \n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para revoca��o de chave\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: removida revoga��o m�ltiplace de subchaves\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: a transferir a chave de revoca��o %"
 "08lX\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
 "presente.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "porta-chaves `%s' criado\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorrecta\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorrectas\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de utilizador sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2769,63 +2774,63 @@ msgstr ""
 "(vendo passaportes, verificando impress�es digitais...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Confio moderadamente\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Confio plenamente\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  N�o foi poss�vel assinar.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2834,11 +2839,11 @@ msgstr ""
 "A sua auto-assinatura em \"%s\"\n"
 "� uma assinatura do tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quer promov�-la a uma auto-assinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2847,12 +2852,12 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2861,55 +2866,55 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quer promov�-la a uma assinatura export�vel? (s/N)"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" j� foi assinado localmente pela chave %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" j� foi assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Esta chave expirou!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "N�o pode criar uma assinatura OpenPGP numa chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto tornaria a chave inutiliz�vel no PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2919,31 +2924,31 @@ msgstr ""
 "pertence\n"
 "� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) N�o vou responder.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) N�o verifiquei.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Verifiquei por alto.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Verifiquei com bastante cuidado.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2952,100 +2957,100 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Isto ser� uma auto-assinatura.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "N�o verifiquei esta chave.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Verifiquei por alto esta chave.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Verifiquei esta chave com muito cuidado.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3053,11 +3058,11 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3065,209 +3070,209 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "a mover a assinatura da chave para o local correcto\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotogr�fico"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "adiciona uma chave de revoca��o"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "seleccionar o identificador do utilizador como prim�rio"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias (perito)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias (detalhadamente)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar um ID de utilizador"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "enable key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostrar identificador fotogr�fico"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura do bloco de chave secreto `%s': %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3275,242 +3280,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "A chave est� revogada."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Este comando n�o � permitido no modo %s.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de utilizador!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente revocar este ID de utilizador? "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "configurar lista de prefer�ncias"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente actualizar as prefer�ncias?"
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "N�o h� prefer�ncias no ID de utilizador tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3518,25 +3523,25 @@ msgstr ""
 "N�o se esque�a que a validade de chave mostrada n�o � necess�riamente a\n"
 "correcta a n�o ser que reinicie o programa.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3545,76 +3550,76 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tem a certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "N�o pode adicionar um identificador fotogr�fico a uma chave tipo PGP2.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3623,372 +3628,372 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP 2.x. Se adicionar um revogador designado\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "N�o pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o de assinatura: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Tem a certeza de que quer revog�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "A mostrar a fotografia %s com o tamanho %ld da chave 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "prefer�ncia %c%lu duplicada\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "a escrever a assinatura directa\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "a escrever a auto-assinatura\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "a escrever a assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar dados"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4004,7 +4009,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4020,40 +4025,40 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A assinatura � valida por? (0) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4061,12 +4066,12 @@ msgstr ""
 "O seu sistema n�o consegue mostrar datas para al�m de 2038.\n"
 "No entanto, estas v�o ser tratadas correctamente at� 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 #, fuzzy
 msgid ""
 "\n"
@@ -4084,44 +4089,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4132,7 +4137,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor n�o coloque o endere�o de email no nome verdadeiro ou no "
@@ -4149,23 +4154,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)mail ou (S)air? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4173,12 +4178,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4190,7 +4195,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4202,50 +4207,50 @@ msgstr ""
 "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
 "uma hip�tese maior de ganhar entropia suficiente.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenhum porta-chaves p�blico com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenhum porta-chaves secreto com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves p�blico `%s': %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4254,12 +4259,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para cifragem. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4267,7 +4272,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4275,699 +4280,699 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a cria��o de sub-chave para chaves v3 n�o respeito o OpenPGP\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Politica de assinatura cr�tica: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Politica de assinatura: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Nota��o de assinatura cr�tica: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Nota��o de assinatura: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Porta-chaves"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "  Impress�o da chave ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 ficheiros com informa��es confidenciais.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte esta poss�vel falha de seguran�a\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "a verificar o porta chaves `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chave verificadas (%lu assinaturas)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chave verificadas (%lu assinaturas)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, 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:290
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "a assumir dados cifrados %s\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensagem n�o tinha a sua integridade protegida\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "n�o � uma assinatura separada\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 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:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desactivar core dumps: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o 'plugin' com a cifra IDEA n�o est� presente\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostrar mais informa��es\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op��o depreciada \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor utilize \"%s%s\" em vez dela\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensagem poder� n�o ser utiliz�vel pelo %s\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' j� existe. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Digite novo nome de ficheiro"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "a escrever em \"stdout\"\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "a assumir dados assinados em `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, 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"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema com o agente - a desactivar a utiliza��o deste\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4980,28 +4985,28 @@ msgstr ""
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Insira a frase secreta\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interactivo\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5011,21 +5016,21 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5034,166 +5039,166 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s: n�o � um base de dados de confian�a\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "A chave foi substitu�da"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "A chave foi comprometida"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "A chave j� n�o � utilizada"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "O identificador do utilizador j� n�o � v�lido"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "motivo da revoca��o: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "coment�rio da revoca��o: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nenhum valor de confian�a designado para:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = N�o sei\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Eu N�O confio\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Confio de forma total\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = voltar ao menu principal\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = saltar esta chave\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = sair\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Decis�o? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Tem a certeza que quer confiar totalmente nesta chave?"
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lx: N�o h� indica��o de que a assinatura pertence realmente ao dono.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lx: N�o h� indica��o de que a assinatura pertence realmente ao dono.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence-nos\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5205,113 +5210,113 @@ msgstr ""
 "sim � pr�xima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Usar esta chave de qualquer modo? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: A utilizar uma chave que n�o � de confian�a!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
 "presente.\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta chave foi desactivada.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
 "       confi�veis!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "N�o especificou um identificador de utilizador. (pode usar \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5319,171 +5324,171 @@ msgstr ""
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� colocada como destinat�rio por omiss�o\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o gravados; use a op��o \"--output\" para grav�-los\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do ficheiro de dados: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "lendo do \"stdin\" ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "n�o h� dados assinados\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinat�rio an�nimo; a tentar chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codifica��o antiga do DEK n�o suportada\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de cifra %d%s � desconhecido ou foi desactivado\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: algoritmo de cifragem %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5494,124 +5499,124 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Usar esta chave de qualquer modo? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "partes da chave secreta n�o dispon�veis\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Frase secreta inv�lida; por favor tente novamente"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "a gerar a 'checksum' (depreciada) de 16-bit para protec��o da chave secreta\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "chave fraca criada - tentando novamente\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "tentei %d vezes!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVISO: conflito no 'digest' de assinatura da mensagem\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica %08lX � %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5619,7 +5624,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5627,55 +5632,36 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "assumindo assinatura incorrecta na chave %08lX devido a um bit cr�tico "
 "desconhecido\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "chave %08lX: sem subchave para o pacote revoca��o de subchave\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/sign.c:85
-#, fuzzy
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
-
-#: g10/sign.c:93
-#, fuzzy
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).  A "
 "utilizar n�o expandida.\n"
 
-#: g10/sign.c:124
-#, fuzzy
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5683,7 +5669,7 @@ msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
 "A utilizar n�o expandida.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5692,21 +5678,21 @@ msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
 "A utilizar n�o expandida.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar-desligar com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5714,404 +5700,404 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar � vista com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "ser� utilizada a cifragem %s\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave n�o est� marcada insegura - imposs�vel us�-la com o RNG falso!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignorado `%s': duplicada\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "ignorado `%s': esta � uma chave ElGamal gerada pelo PGP que n�o � segura "
 "para assinaturas!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importar os valores de confian�a"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dados de confian�a: sincroniza��o falhou: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "base de dados de confian�a rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "base de dados de confian�a rec %lu: escrita falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "transa��o de base de dados de confian�a muito grande\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registo de vers�o: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: base de dados de confian�a inv�lida criada\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: base de dados de confian�a criada\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOTA: n�o � poss�vel escrever na trustdb\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de dados de confian�a inv�lida\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro a actualizar registo de vers�o: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao ler registo de vers�o: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escrever registo de vers�o: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dados de confian�a: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um base de dados de confian�a\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registo de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registo: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registo: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "A base de dados de confian�a est� danificada; por favor execute\n"
 "\"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' n�o � um identificador longo de chave v�lido\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceite como chave de confian�a\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "chave %08lX ocrreu mais do que uma vez na base de dados de confian�a\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chave %08lX: nenhuma chave p�blica para chave de confian�a - ignorada\n"
 "\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "chave marcada como de confian�a absoluta\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registo de confian�a %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registo de confian�a %lu n�o � do tipo pedido %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "revkey"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "expire"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "vers�o desconhecida"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "proxima verifica��o da base de dados de confian�a a %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave p�blica %08lX n�o encontrada: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confian�a\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 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:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6126,310 +6112,322 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "erro geral"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "formato de pacote desconhecido"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "vers�o desconhecida"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "algoritmo de chave p�blica desconhecido"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "algoritmo de \"digest\" desconhecido"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "chave p�blica incorrecta"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "chave secreta incorrecta"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "assinatura incorrecta"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "erro de \"checksum\""
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "frase secreta incorrecta"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "chave p�blica n�o encontrada"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "algoritmo de criptografia desconhecido"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "n�o � poss�vel abrir o porta-chaves"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "pacote inv�lido"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "armadura inv�lida"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "identificador de utilizador inexistente"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "chave secreta n�o dispon�vel"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "chave secreta incorrecta"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "n�o suportado"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "chave incorrecta"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "erro de leitura"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "erro de escrita"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "erro na abertura do ficheiro"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "erro na cria��o do ficheiro"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "frase-secreta inv�lida"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmo de chave p�blica n�o implementado"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "classe de assinatura desconhecida"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "erro na base de dados de confian�a"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "MPI incorreto"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "limite de recursos"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "porta-chaves inv�lido"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "certificado incorrecto"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "identificador de utilizador malformado"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "erro ao fechar ficheiro"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "erro na renomea��o do ficheiro"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "erro na remo��o do ficheiro"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "dados inesperados"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "conflito de \"timestamp\""
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "algoritmo de chave p�blica inutiliz�vel"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "o ficheiro j� existe"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "chave fraca"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "argumento inv�lido"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "URI incorrecto"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "URI n�o suportado"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "erro na rede"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "n�o cifrado"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "n�o processado"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "chave p�blica n�o utiliz�vel"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "chave secreta n�o utiliz�vel"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "erro do servidor de chaves"
 
-#: util/errors.c:109
+#: util/errors.c:107
 #, fuzzy
 msgid "canceled"
 msgstr "cancelado pelo utilizador\n"
 
-#: util/errors.c:110
+#: util/errors.c:108
 #, fuzzy
 msgid "no card"
 msgstr "n�o cifrado"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "n�o h� dados assinados\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... isto � um bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 #, fuzzy
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "n�o"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "sair"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "AVISO: a utilizar mem�ria insegura!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "por favor veja http://www.gnupg.org/faq.html para mais informa��es\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
+#, fuzzy
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
+
+#, fuzzy
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
+
+#, fuzzy
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr ""
 #~ "DSA necessita de utiliza��o de uma algoritmo de dispers�o de 160 bit\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 194caa965..c098466e4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,101 +11,101 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 1.0\n"
+"Project-Id-Version: GnuPG 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-04-03 13:28+0200\n"
-"PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+0200\n"
+"PO-Revision-Date: 2007-10-23 11:33+0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr ""
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr ""
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -119,14 +119,14 @@ msgstr ""
 "N�O USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -138,62 +138,62 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(S�o necess�rios mais %d bytes)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -201,365 +201,370 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "cabe�alho de armadura inv�lido: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "cabe�alho de armadura: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caractere radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "fim de arquivo prematuro (sem CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "fim de arquivo prematuro (no CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caractere \"quoted printable\" na armadura  - provavelmente um MTA com bugs "
 "foi usado\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado(s)"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 #, fuzzy
 msgid "Language preferences: "
 msgstr "lista prefer�ncias"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Impress�o digital:"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -567,467 +572,467 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita a frase secreta: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo sem \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Deletar esta chave do chaveiro? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Esta � uma chave secreta! - realmente deletar? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, fuzzy, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, fuzzy, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 #, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, fuzzy, c-format
 msgid "`%s' already compressed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s criptografado para: %s\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi criptografada com uma chave fraca na criptografia\n"
 "sim�trica.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 #, fuzzy
 msgid "problem handling encrypted packet\n"
 msgstr "eliminar o campo keyid dos pacotes criptografados\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, fuzzy, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr ""
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr ""
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "chave secreta incorreta"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1035,134 +1040,134 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1172,61 +1177,61 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1246,15 +1251,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1264,7 +1269,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1272,658 +1277,658 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desativado\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[usu�rio n�o encontrado]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 #, fuzzy
 msgid "take the keys from this keyring"
 msgstr "Deletar esta chave do chaveiro? "
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 #, fuzzy
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informa��es de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 #, fuzzy
 msgid ""
 "Syntax: gpg [options] [files]\n"
@@ -1932,7 +1937,7 @@ msgstr ""
 "Sintaxe: gpgm [op��es] [arquivos]\n"
 "Utilit�rio de manuten��o do GnuPG\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1942,7 +1947,7 @@ msgstr ""
 "terceiros. Precisamos dele implementar a rede de confian�a, que n�o tem\n"
 "nada a ver com a rede de certificados (implicitamente criada)."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1950,19 +1955,19 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Se voc� quiser usar esta chave n�o confi�vel assim mesmo, responda \"sim\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Digite o ID de usu�rio do destinat�rio para o qual voc� quer enviar a\n"
 "mensagem."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1976,23 +1981,23 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Digite o tamanho da chave"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"sim\" ou \"n�o\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2004,19 +2009,19 @@ msgstr ""
 "rea��o a erros - o sistema tentar� interpretar o valor dado como um "
 "intervalo."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Digite o nome do possuidor da chave"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "por favor digite um endere�o de email (opcional mas recomendado)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Por favor digite um coment�rio (opcional)"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2030,11 +2035,11 @@ msgstr ""
 "O  para continuar a gera��o da chave.\n"
 "S  para interromper a gera��o da chave."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Responda \"sim\" (ou apenas \"s\") se quiser gerar a subchave."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2075,12 +2080,12 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Responda \"sim\" se quiser assinar TODOS os IDs de usu�rio"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2088,11 +2093,11 @@ msgstr ""
 "Responda \"sim\" se quiser realmente remover este ID de usu�rio.\n"
 "Todos os certificados tamb�m ser�o perdidos!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"sim\" se quiser remover a subchave"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2102,7 +2107,7 @@ msgstr ""
 "remover esta assinatura porque ela pode ser importante para estabelecer\n"
 "uma conex�o de confian�a � chave ou a outra chave certificada por esta."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2114,13 +2119,13 @@ msgstr ""
 "porque a chave desta assinatura pode estabelecer uma conex�o de confian�a\n"
 "atrav�s de outra chave j� certificada."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "A assinatura n�o � v�lida. Faz sentido remov�-la de seu chaveiro."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2133,33 +2138,33 @@ msgstr ""
 "n�o consiga mais usar esta chave. Fa�a isto apenas se por alguma\n"
 "raz�o esta auto-assinatura n�o for v�lida e h� uma segunda dispon�vel."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 #, fuzzy
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor digite a frase secreta"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Por favor repita a �ltima frase secreta, para ter certeza do que voc� "
 "digitou."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "D� o nome para o arquivo ao qual a assinatura se aplica"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"sim\" se quiser sobrescrever o arquivo"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2167,7 +2172,7 @@ msgstr ""
 "Por favor digite um novo nome de arquivo. Se voc� apenas apertar RETURN o\n"
 "arquivo padr�o (que � mostrado em colchetes) ser� usado."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2183,540 +2188,540 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "chave secreta incorreta"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usu�rios: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usu�rios: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importados: %lu"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceito ID de usu�rio sem auto-assinatura '"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de usu�rios v�lidos\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usu�rio\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no chaveiro secreto\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de usu�rio para assinatura\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorada\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, fuzzy, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, fuzzy, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "%s: erro de leitura de bloco de chaves: %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, fuzzy, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de usu�rio sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de usu�rios sem auto-assinaturas v�lidas detectados\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2735,172 +2740,172 @@ msgstr ""
 " 4 = Eu confio completamente\n"
 " s = Mostrar mais informa��es\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2909,90 +2914,90 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3000,12 +3005,12 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3013,208 +3018,208 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: id de usu�rio sem assinatura\n"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de usu�rio"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "add a revocation key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "enable key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "disable key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3222,720 +3227,720 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de usu�rio!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "ignorado `%s': duplicado\n"
 
 # muitas ou demais ???
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "Prefer�ncias demais"
 
 # muitas ou demais ???
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "Prefer�ncias demais"
 
 # muitas ou demais ???
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "Prefer�ncias demais"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
 # key binding ???
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 #, fuzzy
 msgid "Encrypt"
 msgstr "criptografar dados"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padr�o)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Que tamanho de chave voc� quer? (1024) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3951,7 +3956,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -3968,40 +3973,40 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4009,12 +4014,12 @@ msgstr ""
 "Seu sistema n�o consegue mostrar datas al�m de 2038.\n"
 "Apesar disso, elas ser�o corretamente manipuladas at� 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 #, fuzzy
 msgid ""
 "\n"
@@ -4031,44 +4036,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4079,7 +4084,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4094,24 +4099,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4119,12 +4124,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4136,7 +4141,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4148,50 +4153,50 @@ msgstr ""
 "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
 "uma chance melhor de conseguir entropia suficiente.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4200,12 +4205,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para criptografia. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4213,7 +4218,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4221,705 +4226,705 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "assinatura %s de: %s\n"
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 #, fuzzy
 msgid "Signature policy: "
 msgstr "assinatura %s de: %s\n"
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 #, fuzzy
 msgid "Critical signature notation: "
 msgstr "Nota��o: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 #, fuzzy
 msgid "Signature notation: "
 msgstr "Nota��o: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 arquivos com informa��es confidenciais.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este poss�vel furo de seguran�a\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:294
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desativar core dumps: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "atualiza��o do banco de dados de confiabilidade falhou: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' j� existe. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Digite novo nome de arquivo"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "escrevendo em \"stdout\"\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "assumindo dados assinados em `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, fuzzy, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: diret�rio criado\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4931,30 +4936,30 @@ msgstr ""
 "usu�rio: \"%.*s\"\n"
 "%u-bit %s chave, ID %08lX, criada %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4964,21 +4969,21 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4987,168 +4992,168 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "imposs�vel abrir arquivo: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 #, fuzzy
 msgid "unable to display photo ID!\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 #, fuzzy
 msgid "Key is superseded"
 msgstr "A chave � protegida.\n"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 #, fuzzy
 msgid "Key has been compromised"
 msgstr "Esta chave foi desativada"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 #, fuzzy
 msgid "reason for revocation: "
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 #, fuzzy
 msgid "revocation comment: "
 msgstr "[revoga��o]"
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr ""
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nenhum valor de confian�a designado para %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr ""
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "%08lX: N�s N�O confiamos nesta chave\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = voltar ao menu principal\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " q = sair\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Sua decis�o? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence a n�s\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5160,289 +5165,289 @@ msgstr ""
 "sim � pr�xima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Usa esta chave de qualquer modo? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: Usando chave n�o confi�vel!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "       Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 #, fuzzy
 msgid "Note: This key has been disabled.\n"
 msgstr "Esta chave foi desativada"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "       A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
 "       confi�veis!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Voc� n�o especificou um identificador de usu�rio. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Identificador de usu�rio inexistente.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� marcada como destinat�rio padr�o\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desativada\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o salvos; use a op��o \"--output\" para salv�-los\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do arquivo de dados: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "lendo de \"stdin\" ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 #, fuzzy
 msgid "no signed data\n"
 msgstr "no dados assinados\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinat�rio an�nimo; tentando chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codifica��o antiga do DEK n�o suportada\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, fuzzy, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 #, fuzzy
 msgid "public key does not match secret key!\n"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5453,122 +5458,122 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Usa esta chave de qualquer modo? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, fuzzy, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "Frase secreta inv�lida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "chave fraca criada - tentando novamente\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "%d tentativas!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "a chave p�blica � %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica � %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5576,7 +5581,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5584,127 +5589,111 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: chave de assinatura %08lX expirou %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorreta devido a um bit cr�tico desconhecido\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave n�o est� marcada como insegura - imposs�vel us�-la com o pseudo "
 "RNG!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignorado `%s': duplicado\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 #, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "ignorado `%s': esta � uma chave ElGamal gerada pelo PGP que n�o � segura "
 "para assinaturas!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, fuzzy, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5713,352 +5702,352 @@ msgstr ""
 "# Lista de valores de confian�a designados, criada em %s\n"
 "# (Use \"gpgm --import-ownertrust\" para restaur�-los)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "linha muito longa\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr "importar os valores de confian�a"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "erro lendo registro de diret�rio: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "erro de leitura: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "banco de dados de confiabilidade: sincroniza��o falhou: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: escrita falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "transa��o de banco de dados de confiabilidade muito grande\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diret�rio inexistente!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registro de vers�o: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: banco de dados de confiabilidade inv�lido criado\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: banco de dados de confiabilidade criado\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: banco de dados de confiabilidade inv�lido\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro atualizando registro de vers�o: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro escrevendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de arquivo inv�lida %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro escrevendo registro de diret�rio: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registro: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registro: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "O banco de dados de confiabilidade est� danificado; por favor rode\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceita como chave confi�vel.\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 "chave %08lX: imposs�vel coloc�-la no banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confian�a %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, fuzzy, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registro de confian�a %lu: remo��o falhou: %s\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "revkey"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "expire"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "vers�o desconhecida"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 #, fuzzy
 msgid "no need for a trustdb check\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "inser��o de registro de confian�a falhou: %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave p�blica n�o encontrada"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "muda os valores de confian�a"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 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:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6073,312 +6062,312 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linha %u muito longa ou sem LF\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "erro geral"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "formato de pacote desconhecido"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "vers�o desconhecida"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "algoritmo de chave p�blica desconhecido"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "algoritmo de \"digest\" desconhecido"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "chave p�blica incorreta"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "chave secreta incorreta"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "assinatura incorreta"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "erro de \"checksum\""
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "frase secreta incorreta"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "chave p�blica n�o encontrada"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "algoritmo de criptografia desconhecido"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "n�o � poss�vel abrir o chaveiro"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "pacote inv�lido"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "armadura inv�lida"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "identificador de usu�rio inexistente"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "chave secreta n�o dispon�vel"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "chave secreta incorreta"
 
 # suportado ???
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "n�o suportado"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "chave incorreta"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "erro de leitura"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "erro de escrita"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "erro na abertura de arquivo"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "erro na cria��o de arquivo"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "frase secreta inv�lida"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmo de chave p�blica n�o implementado"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "classe de assinatura desconhecida"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "erro no banco de dados de confiabilidade"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "MPI incorreto"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "limite de recurso"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "chaveiro inv�lido"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "certificado incorreto"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "identificador de usu�rio malformado"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "erro no fechamento de arquivo"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "erro na renomea��o de arquivo"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "erro na remo��o de arquivo"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "dados inesperados"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "conflito de \"timestamp\""
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "algoritmo de chave p�blica inutiliz�vel"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "o arquivo j� existe"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "chave fraca"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "argumento inv�lido"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "URI incorreto"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "URI n�o suportado"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "erro na rede"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "n�o criptografado"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "n�o processado(s)"
 
-#: util/errors.c:106
+#: util/errors.c:104
 #, fuzzy
 msgid "unusable public key"
 msgstr "chave p�blica incorreta"
 
-#: util/errors.c:107
+#: util/errors.c:105
 #, fuzzy
 msgid "unusable secret key"
 msgstr "chave secreta incorreta"
 
-#: util/errors.c:108
+#: util/errors.c:106
 #, fuzzy
 msgid "keyserver error"
 msgstr "erro geral"
 
-#: util/errors.c:109
+#: util/errors.c:107
 msgid "canceled"
 msgstr ""
 
-#: util/errors.c:110
+#: util/errors.c:108
 #, fuzzy
 msgid "no card"
 msgstr "n�o criptografado"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "no dados assinados\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... isto � um bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 #, fuzzy
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "sS"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "n�o"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "sair"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 #, fuzzy
 msgid "WARNING: using insecure memory!\n"
 msgstr "Aviso: usando mem�ria insegura!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
diff --git a/po/ro.po b/po/ro.po
index da8a675d3..9a03d4301 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -18,94 +18,94 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "nu pot genera un num�r prim cu  pbi�i=%u qbi�i=%u\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "nu pot genera un num�r prim cu mai pu�in de %d bi�i\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "nu a fost g�sit nici un modul de adunare a entropiei\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "nu pot �ncuia (lock) `%s'\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nu pot ob�ine statistici `%s': %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nu este un fi�ier normal - ignorat\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "not�: fi�ier random_seed este gol\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "AVERTISMENT: dimensiune invalid� pentru fi�ierul random_seed - nu va fi "
 "folosit�\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nu pot citi `%s': %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "not�: fi�ierul random_seed nu a fost actualizat\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nu pot scrie `%s': %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nu pot �nchide `%s': %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "AVERISMENT: este folosit un generator de numere aleatoare nesigur "
 "(insecure)!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -119,7 +119,7 @@ msgstr ""
 "NU FOLOSI�I NICI O DAT� GENERAT� DE ACEST PROGRAM!!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -128,7 +128,7 @@ msgstr ""
 "V� rug�m a�tepta�i, este adunat� entropia. Face�i ceva dac� v� ajut� s�\n"
 "nu v� plictisi�i, pentru c� va �mbun�t��i calitatea entropiei.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -140,62 +140,62 @@ msgstr ""
 "a da sistemului de operare o �ans� de a colecta mai mult� entropie\n"
 "(Mai sunt necesari %d octe�i)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "am e�uat s� stochez data cre�rii: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "citirea cheii publice a e�uat: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr "r�spunsul nu con�ine datele cheii publice\n"
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr "r�spunsul nu con�ine modulul RSA\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr "r�spunsul nu con�ine exponentul public RSA\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "apelul PIN a returnat eroare: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificarea CHV%d a e�uat: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr "accesul la comenzile de administrare nu este configurat�\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr "eroare la recuperarea st�rii CHV de pe card\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr "cardul este �ncuiat permanent!\n"
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d �ncerc�ri PIN Admin r�mase �nainte de a �ncuia cardul permanent\n"
@@ -203,345 +203,350 @@ msgstr "%d �ncerc�ri PIN Admin r�mase �nainte de a �ncuia cardul permanent\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr "|A|PIN Admin"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr "|AN|PIN Admin Nou"
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr "|N|PIN Nou"
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eroare la ob�inere noului PIN: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 msgid "error reading application data\n"
 msgstr "eroare la citirea datelor aplica�iei\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 msgid "error reading fingerprint DO\n"
 msgstr "eroare la citirea amprentei DO\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 msgid "key already exists\n"
 msgstr "cheia exist� deja\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr "cheia existent� va fi �nlocuit�\n"
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 msgid "generating new key\n"
 msgstr "generez o nou� cheie\n"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr "timestamp-ul de creare lipse�te\n"
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "modulus-ul RSA lipse�te sau nu are %d bi�i\n"
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "exponentul public RSA lipse�te sau are mai mult de %d bi�i\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "prime-ul RSA %s lipse�te sau nu are %d bi�i\n"
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr "v� rug�m a�tepta�i c�t� vreme este creat� noua cheie ...\n"
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 msgid "generating key failed\n"
 msgstr "generarea cheii a e�uat\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generarea cheii este complet� (%d secunde)\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structur� invalid� a cardului OpenPGP (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "verificarea PIN-ului Admin este deocamdat� interzis� prin aceast� comand�\n"
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "armur�: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "header armur� invalid: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "header armur�: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "header clearsig invalid\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "header armur�: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "semn�turi text �n clar �ncuib�rite\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 msgid "unexpected armor: "
 msgstr "armur� nea�teptat�: "
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "linie cu liniu�� escape invalid�: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter radix64 invalid %02X s�rit\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (nici un CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (�n CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "CRC anormal\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "eroare CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematur (�n trailer)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "eroare linia de trailer\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armur� invalid�: linie mai lung� de %d caractere\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caracter printabil �n ghilimele �n armur� - probabil a fost folosit un MTA "
 "cu bug-uri\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "cardul OpenPGP nu e disponibil: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru �n modul batch\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Selec�ia d-voastr�? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr "[nesetat(�)]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "female"
 msgstr "feminin"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "unspecified"
 msgstr "nespecificat(�)"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "not forced"
 msgstr "nefor�at(�)"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr "for�at(�)"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Eroare: Deocamdat� sunt permise numai caractere ASCII.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Eroare: Caracterul \"<\" nu poate fi folosit.\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Eroare: Spa�iile duble nu sunt permise.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr "Numele de familie al proprietarului cardului: "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr "Prenumele proprietarului cardului: "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Eroare: Nume combinat prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 msgid "URL to retrieve public key: "
 msgstr "URL pentru a aduce cheia public�: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Eroare: URL prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr "Date login (nume cont): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Eroare: datele de login prea lungi (limita este de %d caractere).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr "Date DO personale: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Eroare DO personal pre lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 msgid "Language preferences: "
 msgstr "Preferin�e limb�: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 msgid "Error: invalid length of preference string.\n"
 msgstr "Eroare: lungime invalid� pentru �ir preferin�e.\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Eroare: caractere invalide �n �ir preferin�e.\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sex ((M)asculin, (F)eminin sau spa�iu): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 msgid "Error: invalid response.\n"
 msgstr "Eroare: r�spuns invalid.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 msgid "CA fingerprint: "
 msgstr "Amprenta CA: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Eroare: amprent� formatat� invalid.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "opera�ia pe cheie nu e posibil�: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 msgid "not an OpenPGP card"
 msgstr "nu este un card OpenPGP"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr "�nlocuiesc cheia existent�? (d/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Creez copie de rezerv� a cheii de cifrare �n afara cardului? (d/N) "
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr "�nlocuiesc cheile existente? (d/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -552,140 +557,140 @@ msgstr ""
 "   PIN = `%s'     PIN Admin = `%s'\n"
 "Ar trebui s� le schimba�i folosind comanda --change-pin\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 msgid "Please select the type of key to generate:\n"
 msgstr "V� rug�m selecta�i tipul de cheie de generat:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 msgid "Please select where to store the key:\n"
 msgstr "V� rug�m selecta�i unde s� fie stocat� cheia:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 msgid "unknown key protection algorithm\n"
 msgstr "algoritm de protec�ie a cheii necunoscut\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 msgid "secret parts of key are not available\n"
 msgstr "p�r�i secrete ale cheii nu sunt disponibile\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 msgid "secret key already stored on a card\n"
 msgstr "cheia secret� deja stocat� pe un card\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "show admin commands"
 msgstr "arat� comenzi administrare"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "list all available data"
 msgstr "afi�eaz� toate datele disponibile"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr "schimb� numele purt�torului cardului"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr "schimb� URL-ul de unde s� fie adus� cheia"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr "adu cheia specificat� de URL-ul de pe card"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change the login name"
 msgstr "schimb� numele de login"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "change the language preferences"
 msgstr "schimb� preferin�ele de limb�"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr "schimb� sexul purt�torului cardului"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "change a CA fingerprint"
 msgstr "schimb� o amprent� CA"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr "comut� fanionul PIN de for�are a semn�turii"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 msgid "generate new keys"
 msgstr "genereaz� noi chei"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr "meniu pentru a schimba sau debloca PIN-ul"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr "verific� PIN-ul �i listeaz� toate datele"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Comand�> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 msgid "Admin-only command\n"
 msgstr "Comand� numai-administrare\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 msgid "Admin commands are allowed\n"
 msgstr "Sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "cheia secret� nu e disponibil�"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 "V� rug�m introduce�i cardul �i ap�sa�i return sau ap�sa�i 'c' pentru a "
 "renun�a: "
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "stergere keyblock a e�uat: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -694,133 +699,133 @@ msgstr ""
 "V� rug�m scoate�i cardul curent �i introduca�i unul cu num�r de serie:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Ap�sa�i return c�nd sunte�i gata sau ap�sa�i 'c' pentru a renun�a: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr "Introduce�i noul PIN Admin: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr "introduce�i noul PIN: "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr "Introduce�i PIN Admin: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr "Introduce�i PIN: "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 msgid "Repeat this PIN: "
 msgstr "Repeta�i acest PIN: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-ul nu a fost repetat corect; mai �ncerca�i o dat�"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eroare la citire keyblock: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(dac� nu specifica�i cheia prin amprent�)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "nu pot face acest lucru �n mod batch f�r� \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "�terge aceast� cheie din inelul de chei? (d/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Aceasta este o cheie secret�! - chiar dori�i s� o �terge�i? (d/N) "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "stergere keyblock a e�uat: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "informa�ii �ncredere-proprietar cur��ate\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "exist� o cheie secret� pentru cheia public� \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
 "�nt�i.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "nu pot crea un pachet ESK simetric datorit� modului S2K\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "folosesc cifrul %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' deja compresat\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "�n modul --pgp2 pute�i cifra numai cu chei RSA de 2048 bi�i sau mai pu�in\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "citesc din `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "nu pot folosi cifrul IDEA pentru pentru toate cheile pentru care cifra�i.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -828,7 +833,7 @@ msgstr ""
 "AVERTISMENT: for��nd cifrul simetric %s (%d) viola�i preferin�ele "
 "destinatarului\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -837,167 +842,167 @@ msgstr ""
 "AVERTISMENT: for��nd algoritmul de compresie %s (%d) viola�i preferin�ele "
 "destinatarului\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "for��nd cifrul simetric %s (%d) viola�i preferin�ele destinatarului\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrat pentru: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s date cifrate\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrat cu un algoritm necunoscut %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVERTISMENT: mesajul a fost cifrat cu o cheie slab� din cifrul simetric.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "problem� cu m�nuirea pachetului cifrat\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "nu este suportat� execu�ia nici unui program la distan��\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "chemarea programelor externe sunt deactivate datorit� op�iunilor nesigure "
 "pentru permisiunile fi�ierului\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "aceast� platform� necesit� fi�iere temporare c�nd sunt chemate programe "
 "externe\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "nu pot executa programul `%s': %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nu pot executa shell-ul `%s': %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "eroare de sistem la chemarea programului extern: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "ie�ire nenatural� a programului extern\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "nu pot executa programul extern\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "nu pot citi r�spunsul programului extern: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "AVERTISMENT: nu pot �terge fi�ierul temporar (%s) `%s': %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVERTISMENT: nu pot �terge directorul temporar `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "nici o cheie de revocare g�sit� pentru \"%s\"\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoc� cheia sau subcheile selectate"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "cheie secret� de nefolosit"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 msgid "exporting secret keys not allowed\n"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "cheia %s: nu e protejat� - s�rit�\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cheia %s: cheie stil PGP 2.x - s�rit�\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVERTISMENT: cheia secret� %s nu are un checksum SK simplu\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTISMENT: nimic exportat\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1005,127 +1010,127 @@ msgstr ""
 "@Comenzi:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "creaz� o semn�tur� deta�at�"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "cifreaz� datele"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "cifreaz� numai cu cifru simetric"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "decripteaz� datele (implicit)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "verific� o semn�tur�"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "enumer� chei"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "enumer� chei �i semn�turi"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "list and check key signatures"
 msgstr "enumer� �i verific� semn�turile cheii"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "enumer� chei �i amprente"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "enumer� chei secrete"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "genereaz� o nou� perechi de chei"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "�terge chei de pe inelul de chei secret"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "semneaz� o cheie"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "semneaz� o cheie local"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "semneaz� sau editeaz� o cheie"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "genereaz� un certificat de revocare"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "export� chei"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "export� chei pentru un server de chei"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "import� chei de la un server de chei"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "actualizeaz� toate cheile de la un server de chei"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "import�/combin� chei"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr "afi�eaz� starea cardului"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr "schimb� data de pe card"
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr "schimb� PIN-ul unui card"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1135,51 +1140,51 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "folose�te ca fi�ier ie�ire"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "locvace"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "�ntreab� �nainte de a suprascrie"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr "folose�te comportament strict OpenPGP"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr "genereaz� mesaje compatibile cu PGP 2.x"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1187,7 +1192,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1207,15 +1212,15 @@ msgstr ""
 " --list-keys [nume]         arat� chei\n"
 " --fingerprint [nume]       arat� amprente\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1225,7 +1230,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1233,77 +1238,77 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nu am g�sit nici un semn = �n defini�ia grupului `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1311,21 +1316,21 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1333,555 +1338,555 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "arat� c�ruia dintre inelele de chei �i apar�ine o cheie enumerat�"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "extensie cifru `%s' nu a fost �nc�rcat din cauza permisiunilor nesigure "
 "(unsafe)\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "NOT�: %s nu este disponibil �n aceast� sesiune\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nu va rula cu memorie neprotejat� (insecure) pentru c� %s\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "pute�i crea doar semn�turi deta�ate sau �n clar c�t� vreme sunte�i �n modul "
 "--pgp2\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "nu pute�i semna �i cifra �n acela�i timp c�t� vreme sunte�i �n modul --pgp2\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "trebuie s� folosi�i fi�iere (�i nu un pipe) c�nd lucra�i cu modul --pgp2 "
 "activat.\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrarea unui mesaj �n modul --pgp2 necesit� un cifru IDEA\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth trebuie s� fie �n intervalul de la 1 la 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de cifrare `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algorimul de rezumat `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de compresie `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISMENT: destinatari (-r) furniza�i f�r� a folosi cifrare cu cheie "
 "public�\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "prea multe intr�ri �n cache-ul pk - deactivat\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 msgid "[User ID not found]"
 msgstr "[ID utilizator nu a fost g�sit]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Cheia invalid� %s f�cut� valid� de --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "nici o subcheie secret� pentru subcheia public� %s - ignorat�\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "folosim subcheia %s �n loc de cheia primar� %s\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai t�cut"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "ia cheile de pe acest inel de chei"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "d� numai un avertisment la conflicte de timestamp"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informa�ii de stare �n acest FD"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Folosire: gpgv [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1889,7 +1894,7 @@ msgstr ""
 "Sintax�: gpg [op�iuni] [fi�iere]\n"
 "Verific� semn�turi folosind cheile cunoscute ca fiind de �ncredere\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1900,7 +1905,7 @@ msgstr ""
 "implement�m re�eaua-de-�ncredere; aceasta nu are nimic �n comun cu\n"
 "certificatele-de-re�ea (create implicit)."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1912,18 +1917,18 @@ msgstr ""
 "ave�i acces la cheia secret�.  R�spunde�i \"da\" pentru a seta\n"
 "aceast� cheie cu nivel de �ncredere suprem\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Dac� dori�i oricum s� folosi�i aceast� cheie f�r� �ncredere, r�spunde�i \"da"
 "\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Introduce�i ID-ul utilizator al destinatarului mesajului."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1948,7 +1953,7 @@ msgstr ""
 "Prima cheie (primar�) trebuie s� fie �ntotdeauna o cheie cu care se poate "
 "semna."
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1958,16 +1963,16 @@ msgstr ""
 "semnare �i pentru cifrare.  Acest algoritm ar trebui folosit numai\n"
 "�n anumite domenii.  V� rug�m consulta�i mai �nt�i un expert �n domeniu."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Introduce�i lungimea cheii"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "R�spunde�i \"da\" sau \"nu\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1979,19 +1984,19 @@ msgstr ""
 "ob�ine un r�spuns de eroare bun - �n loc sistemul �ncearc� s�\n"
 "interpreteze valoare dat� ca un interval."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Introduce�i numele de�in�torului cheii"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "v� rug�m introduce�i o adres� de email (op�ional� dar recomandat�)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "V� rug�m introduce�i un comentriu op�ional"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2005,12 +2010,12 @@ msgstr ""
 "O  pentru a continua cu generarea cheii.\n"
 "T  pentru a termina generarea cheii."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "R�spunde�i \"da\" (sau numai \"d\") dac� sunte�i OK s� genera�i subcheia."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2084,11 +2089,11 @@ msgstr ""
 "\n"
 "Dac� nu �ti�i care este r�spunsul, r�spunde�i \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "R�spunde�i \"da\" dac� dori�i s� semna�i TOATE ID-urile utilizator"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2096,11 +2101,11 @@ msgstr ""
 "R�spunde�i \"da\" dac� �ntr-adev�r dori�i s� �terge�i acest ID utilizator.\n"
 "Toate certificatele sunt de asemenea pierdute!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "R�spunde�i \"da\" dac� este OK s� �terge�i subcheia"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2111,7 +2116,7 @@ msgstr ""
 "stabilirea conexiunii de �ncredere la cheie sau alt� cheie certificat�\n"
 "de aceast� cheie."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2123,7 +2128,7 @@ msgstr ""
 "cheie a fost folosit� pentru c� aceast� cheie de semnare ar putea\n"
 "constitui o conexiune de �ncredere spre o alt� cheie deja certificat�."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2131,7 +2136,7 @@ msgstr ""
 "Semn�tura nu este valid�.  Aceasta ar trebui �tears� de pe inelul\n"
 "d-voastr� de chei."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2145,7 +2150,7 @@ msgstr ""
 "A�a c� face�i acest lucru numai dac� aceast� auto-semn�tur� este\n"
 "dintr-o oarecare cauz� invalid� �i o a doua este disponibil�."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2155,25 +2160,25 @@ msgstr ""
 "cele selectate) conform cu lista curent� de preferin�e.  Timestamp-urile\n"
 "tuturor auto-semn�turilor afectate vor fi avansate cu o secund�.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "V� rug�m repeta�i ultima fraz�-parol�, pentru a fi sigur(�) ce a�i tastat."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Da�i numele fi�ierului la care se aplic� semn�tura"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "R�spunde�i \"da\" dac� este OK s� suprascrie�i fi�ierul"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2181,7 +2186,7 @@ msgstr ""
 "V� rug�m introduce�i un nou nume-fi�ier. Dac� doar ap�sa�i RETURN,\n"
 "va fi folosit fi�ierul implicit (ar�tat �n paranteze)."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2210,7 +2215,7 @@ msgstr ""
 "folosit;\n"
 "      de obicei folosit� pentru a marca o adres� de email ca invalid�.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2220,535 +2225,535 @@ msgstr ""
 "certificat de revocare.  V� rug�m fi�i concis.\n"
 "O linie goal� termin� textul.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Nici un ajutor disponibil"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nici un disponibil disponibil pentru `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "cheia public� nu se potrive�te cu cheia secret�!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "cheie secret� de nefolosit"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "bloc de tip %d s�rit\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chei procesate p�n� acum\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Num�r total procesate: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      chei noi s�rite: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "  f�r� ID-uri utilizator: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "               importate: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             neschimbate: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "   noi ID-uri utilizator: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "             noi subchei: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           noi semn�turi: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "    noi revoc�ri de chei: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     chei secrete citite: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chei secrete importate: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chei secrete neschimbate: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            ne importate: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     chei secrete citite: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, fuzzy, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "AVERTISMENT: cheia %s con�ine preferin�e pentru indisponibil\n"
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "algoritmuri pentru aceste ID-uri utilizator:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm de cifrare %s\n"
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm rezumat %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm compresie %s\n"
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 "este puternic sugerat s� v� actualiza�i preferin�ele �i re-distribui�i\n"
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "aceast� cheie pentru a avita probleme poten�iale de ne-potrivire de "
 "algoritm\n"
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "v� pute�i actualiza preferin�ele cu: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cheia %s: nici un ID utilizator\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cheia %s: subcheia HPK corupt� a fost reparat�\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cheia %s: nici un ID utilizator valid\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "aceasta poate fi cauzat� de o auto-semn�tur� ce lipse�te\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cheia %s: cheia public� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cheia %s: cheie nou� - s�rit�\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 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:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scriu �n `%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cheia %s: cheia public� \"%s\" importat�\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cheia %s: nu se potrive�te cu copia noastr�\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cheia %s: nu pot g�si keyblock-ul original: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cheia %s: \"%s\" 1 nou� semn�tur�\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cheia %s: \"%s\" 1 nou� subcheie\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cheia %s: \"%s\" %d noi subchei\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cheia %s: \"%s\" nu a fost schimbat�\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "cheia %s: cheie secret� cu cifru invalid %d - s�rit�\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "importul de chei secrete nu este permis\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nici un inel de chei secrete implicit: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cheia %s: cheie secret� importat�\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cheia %s: deja �n inelul de chei secrete\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cheia %s: cheia secret� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cheia %s: nici o cheie public� - nu pot aplica certificatul de revocare\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cheia %s: nici un ID utilizator pentru semn�tur�\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cheia %s: algoritm cu cheie public� nesuportat pentru ID-ul utilizator \"%s"
 "\"\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cheia %s: auto-semn�tur� invalid� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cheia %s: legare subcheie invalid�\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cheia %s: am �ters multiple leg�turi de subchei\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cheia %s: nici o subcheie pentru revocare de cheie\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cheia %s: revocare de subcheie invalid�\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cheia %s: am �ters multiple revoc�ri de subcheie\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cheia %s: am s�rit ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cheia %s: am s�rit subcheia\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cheia %s: semn�tura nu poate fi exportat� (clasa 0x%02X) - s�rit�\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cheia %s: certificat de revocare �ntr-un loc gre�it - s�rit\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - s�rit\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cheia %s: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTISMENT: cheia %s poate fi revocat�: aduc revocarea cheii %s\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISMENT: cheia %s poate fi revocat�: cheia de revocare %s nu este "
 "prezent�.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cheia %s: am ad�ugat certificatul de revocare \"%s\"\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOT�: S/N-ul unei chei nu se potrive�te cu cel al cardului\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOT�: cheia primar� este online �i stocat� pe card\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOT�: cheia secundar� este online �i stocat� pe card\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "inelul de chei `%s' creat\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "resurs� keyblock `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revocare]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[auto-semn�tur�]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 semn�tur� incorect�\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d semn�turi incorecte\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 semn�tur� nu a fost verificat� din cauza unei chei lips�\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d semn�turi nu au fost verificate din cauza unor chei lips�\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d semn�turi nu au fost verificate din cauza unor erori\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "am g�sit 1 ID utilizator f�r� auto-semn�tur� valid�\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "am g�sit %d ID-uri utilizator f�r� auto-semn�turi valide\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2759,17 +2764,17 @@ msgstr ""
 "pentru a verifica cheile altor utilizatori (folosind pa�apoarte,\n"
 "verific�nd amprentele din diferite surse, etc.)\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = Am o �ncredere marginal�\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = Am toat� �ncrederea\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2779,47 +2784,47 @@ msgstr ""
 "O ad�ncime mai mare de 1 permite ca cheia pe care o semna�i s� fac�\n"
 "semn�turi de �ncredere �n numele d-voastr�.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "V� rug�m s� introduce�i domeniul de restric�ionare al acestei semn�turi, sau "
 "ap�sa�i enter pentru niciunul.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� �terge�i permanent \"%s\"? (d/N)"
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  Nu pot semna.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID utilizator \"%s\" este expirat."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID-ul utilizator \"%s\" poate fi semnat.  "
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "Dori�i s�-l semna�i? (d/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2828,11 +2833,11 @@ msgstr ""
 "Auto-semn�tura pe \"%s\"\n"
 "este o semn�tur� stil PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Dori�i s� o promova�i la o auto-semn�tur� OpenPGP? (d/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2841,12 +2846,12 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "a expirat.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Dori�i s� crea�i o nou� semn�tur� pentru a o �nlocui pe cea expirat�? (d/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2855,43 +2860,43 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "semn�tur� local�.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Dori�i s� o promova�i la o semn�tur� total exportabil�? (d/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" a fost deja semnat� local de cheia %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" a fost deja semnat� de cheia %s\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Dori�i s� o semna�i oricum din nou? (d/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nimic de semnat cu cheia %s\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Aceast� cheie a expirat!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aceast� cheie va expira pe %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Dori�i ca semn�tura d-voastr� s� expire �n acela�i timp? (D/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2899,11 +2904,11 @@ msgstr ""
 "Nu pute�i crea o semn�tur� OpenPGP pe o cheie PGP 2.x c�t� vreme sunte�i �n "
 "modul --pgp2.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Aceasta va face cheia de nefolosit �n PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2914,31 +2919,31 @@ msgstr ""
 "�ntr-adev�r persoanei numite deasupra?  Dac� nu �ti�i ce s� r�spunde�i,\n"
 "introduce�i \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nu voi r�spunde.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nu am verificat deloc.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Am f�cut ceva verific�ri superficiale.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Am f�cut verific�ri foarte atente.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Selec�ia dvs.? (introduce�i `?' pentru informa�ii suplimentare): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2947,76 +2952,76 @@ msgstr ""
 "Sunte�i �ntr-adev�r sigur(�) c� dori�i s� semna�i\n"
 "aceast� cheie cu cheia d-voastr� \"%s\" (%s)\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 msgid "This will be a self-signature.\n"
 msgstr "Aceasta va fi o auto-semn�tur�.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-exportabil�.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-revocabil�.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Semn�tura va fi marcat� ca non-exportabil�.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "I have not checked this key at all.\n"
 msgstr "Nu am verificat aceast� cheie deloc.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 msgid "I have checked this key casually.\n"
 msgstr "Am verificat aceast� cheie superficial.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 msgid "I have checked this key very carefully.\n"
 msgstr "Am verificat aceast� cheie foarte atent.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 msgid "Really sign? (y/N) "
 msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Cheia are numai articole de cheie sau talon (stub) pe card - nici o fraz� "
 "parol� de schimbat.\n"
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Aceast� cheie nu este protejat�.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "P�r�i secrete ale cheii primare sunt stacate pe card.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "Cheia este protejat�.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nu pot edita aceast� cheie: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3024,11 +3029,11 @@ msgstr ""
 "Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3036,190 +3041,190 @@ msgstr ""
 "Nu dori�i o fraz�-parol� - aceasta este probabil o idee *proast�*!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 msgid "Do you really want to do this? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� face�i acest lucru? (d/N) "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "mut o semn�tur� de cheie �n locul corect\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "salveaz� �i termin�"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "afi�eaz� amprenta cheii"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "enumer� chei �i ID-uri utilizator"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "selecteaz� ID utilizator N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "selecteaz� subcheia N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "verific� semn�turi"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "semneaz� ID-urile utilizator selectate [* vezi mai jos pentru comenzi "
 "relevante]"
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs locally"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i local"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a trust signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� de �ncredere"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� irevocabil�"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "adaug� un ID utilizator"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "adaug� o poz� ID"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 msgid "delete selected user IDs"
 msgstr "�terge ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "add a subkey"
 msgstr "adaug� o subcheie"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr "adaug� o cheie la un smartcard"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr "mut� o cheie pe un smartcard"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr "mut� o cheie de rezerv� pe un smartcard"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 msgid "delete selected subkeys"
 msgstr "�terge subcheile selectate"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "adaug� o cheie de revocare"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 msgid "delete signatures from the selected user IDs"
 msgstr "�terge semn�turile de pe ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "schimb� data de expirare pentru cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 msgid "flag the selected user ID as primary"
 msgstr "marcheaz� ID-ul utilizator selectat ca primar"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 msgid "toggle between the secret and public key listings"
 msgstr "comut� �ntre listele de chei secrete �i publice"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "enumer� preferin�ele (expert)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "afi�eaz� preferin�ele (detaliat)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "set preference list for the selected user IDs"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "seteaz� URL-ul serverului de chei preferat pentru ID-urile utilizator "
 "selectate"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "schimb� �ncrederea pentru proprietar"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 msgid "revoke signatures on the selected user IDs"
 msgstr "revoc� semn�turile pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 msgid "revoke selected user IDs"
 msgstr "revoc� ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "revoke key or selected subkeys"
 msgstr "revoc� cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 msgid "enable key"
 msgstr "activeaz� cheia"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 msgid "disable key"
 msgstr "deactiveaz� cheia"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 msgid "show selected photo IDs"
 msgstr "arat� pozele pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eroare la citire keyblock secret \"%s\": %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Cheia secret� este disponibil�.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Ave�i nevoie de cheia secret� pentru a face aceasta.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "V� rug�m folosi�i mai �nt�i comanda \"toggle\".\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3231,228 +3236,228 @@ msgstr ""
 "  pentru semn�turi irevocabile (nrsign), sau orice combina�ie a acestora\n"
 "  (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "Cheia este revocat�."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? (d/N) "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Tip de semn�tur� necunoscut `%s'\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Trebuie mai �nt�i s� selecta�i cel pu�in un ID utilizator.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�terge�i �ntr-adev�r toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 msgid "Really remove this user ID? (y/N) "
 msgstr "�terge�i �ntr-adev�r acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 msgid "Really move the primary key? (y/N) "
 msgstr "Muta�i �ntr-adev�r cheia primar�? (d/N) "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 msgid "You must select exactly one key.\n"
 msgstr "Trebuie s� selecta�i exact o cheie.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr "Comanda a�teapt� un nume de fi�ier ca argument\n"
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nu pot deschide `%s': %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Eroare citind cheia de rezerv� de pe `%s': %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i aceast� cheie? (d/N) "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i toat� cheia? (d/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i subcheile selectate? (d/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� subcheie? (d/N) "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "�ncrederea proprietar nu poate fi setat� c�nd este folosit� o baz� de date "
 "de �ncredere furnizat� de utilizator\n"
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 msgid "Set preference list to:\n"
 msgstr "Seteaz� lista de preferin�e ca:\n"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator "
 "selectate? (d/N) "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 msgid "Really update the preferences? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? (d/N) "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 msgid "Save changes? (y/N) "
 msgstr "Salva�i schimb�rile?  (d/N) "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 msgid "Quit without saving? (y/N) "
 msgstr "Termina�i f�r� a salva?  (d/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "Cheia nu a fost schimbat� a�a c� nici o actualizare a fost necesar�.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Capabilit��i: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr "Server de chei no-modify"
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota�ie:"
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nu exist� nici o preferin�� pentru un ID utilizator stil PGP 2.x.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aceast� cheie a fost revocat� pe %s de %s cheia %s\n"
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aceast� cheie poate fi revocat� de %s cheia %s"
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, c-format
 msgid "created: %s"
 msgstr "creat�: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, c-format
 msgid "revoked: %s"
 msgstr "revocat�: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "expirat�: %s"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, c-format
 msgid "expires: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, c-format
 msgid "trust: %s"
 msgstr "�ncredere: %s"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Aceast� cheie a fost deactivat�"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3461,17 +3466,17 @@ msgstr ""
 "corect� dac� nu reporni�i programul.\n"
 
 #
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "revocat�"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "expirat�"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3480,7 +3485,7 @@ msgstr ""
 "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
 "              s� devin� ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3489,74 +3494,74 @@ msgstr ""
 "AVERTISMENT: Aceasta este o cheie stil PGP2.  Ad�ugarea unei poze ID poate\n"
 "         cauza unele versiuni de PGP s� resping� aceast� cheie.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o ad�uga�i? (d/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nu pute�i ad�uga o poz� ID la o cheie stil PGP2.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "invalid(�)"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3566,364 +3571,364 @@ msgstr ""
 "             desemnat poate face ca unele versiuni de PGP s� resping� "
 "cheia.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nu pute�i ad�uga un revocator desemnat la o cheie stil PGP 2.x.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nu pute�i desemna o cheie ca propriul s�u revocator desemnat\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "aceast� cheie a fost deja desemnat� ca un revocator\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi "
 "anulat�!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 msgid "Please select at most one subkey.\n"
 msgstr "V� rug�m selecta�i cel mult o subcheie.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nu pute�i schimba data de expirare a unei chei v3\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
 "certified)\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "auto-semn�tur� v3 s�rit� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notare semn�tur�: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "semnat� de cheia d-voastr� %s la %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceast� semn�tur� a expirat pe %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o revoca�i? (d/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Crea�i un certificat de revocare pentru aceast� semn�tur�? (d/N) "
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "A�i semnat aceste ID-uri utilizator pe cheia %s:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 msgid " (non-revocable)"
 msgstr " (non-revocabil�)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocat� de cheia d-voastr� %s pe %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� crea�i certificatele de revocare? (d/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "nici o cheie secret�\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISMENT: o semn�tur� ID utilizator este datat� %d secunde �n viitor\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Afi�ez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "preferin�a `%s' duplicat�\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "prea multe preferin�e de cifrare\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "prea multe preferin�e de rezumat\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "prea multe preferin�e de compresie\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "articol invalid `%s' �n �irul de preferin�e\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "scriu semn�tur� direct�\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "scriu auto semn�tur�\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "scriu semn�tur� legat� de cheie\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjit� la %u bi�i\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 msgid "Sign"
 msgstr "Semneaz�"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 msgid "Encrypt"
 msgstr "Cifreaz�"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr "Autentific�"
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr "SsCcAaTt"
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Ac�iuni posibile pentru o cheie %s: "
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr "Ac�iuni permise curent: "
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Comut� capabilitatea de semnare\n"
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Comut� capabilitatea de cifrare\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Comut� capabilitatea de autentificare\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Terminat\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecta�i ce fel de cheie dori�i:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA �i Elgamal (implicit)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (numai semnare)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (numai cifrare)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (numai semnare)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Perechea de chei DSA va avea %u bi�i.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "cheile %s pot avea lungimea �ntre %u �i %u bi�i.\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ce lungime de cheie dori�i? (%u) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "dimensiunile cheii %s trebuie s� fie �n intervalul %u-%u\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Lungimea cheii necesar� este %u bi�i\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rotunjit� prin adaos la %u bi�i\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3939,7 +3944,7 @@ msgstr ""
 "      <n>m = cheia expir� �n n luni\n"
 "      <n>y = cheia expir� �n n ani\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3955,38 +3960,38 @@ msgstr ""
 "      <n>m = semn�tura expir� �n n luni\n"
 "      <n>y = semn�tura expir� �n n ani\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "Cheia este valid� pentru? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Semn�tura este valid� pentru? (%s) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "valoare invalid�\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 msgid "Key does not expire at all\n"
 msgstr "Cheia nu expir� deloc\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 msgid "Signature does not expire at all\n"
 msgstr "Semn�tura nu expir� deloc\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Cheia expir� pe %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Semn�tura expir� pe %s\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3994,11 +3999,11 @@ msgstr ""
 "Sistemul d-voastr� nu poate afi�a date dup� 2038.\n"
 "Totu�i, acestea vor fi corect m�nuite p�n� �n 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 msgid "Is this correct? (y/N) "
 msgstr "Este aceasta corect? (d/N) "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4015,44 +4020,44 @@ msgstr ""
 "    \"Popa Ioan (popic�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Nume real: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid �n nume\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "Numele nu poate �ncepe cu o cifr�\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "Numele trebuie s� fie de cel pu�in 5 caractere\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "Adres� de email: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Nu este o adres� de email valid�\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Comentariu: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Caracter invalid �n comentariu\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Folosi�i setul de caractere `%s'\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4063,7 +4068,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
 
@@ -4078,23 +4083,23 @@ msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoTt"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (T)Termin�? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin�? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4102,12 +4107,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4118,7 +4123,7 @@ msgstr ""
 "O s� o fac oricum.  Pute�i schimba fraza-parol� oric�nd, folosind acest\n"
 "program cu op�iunea \"--edit-key\".\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4130,50 +4135,50 @@ msgstr ""
 "�n timpul gener�rii numerelor prime; aceasta d� o �ans� generatorului de\n"
 "numere aleatoare o �ans� mai bun� de a aduna destul� entropie.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulat�.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scriu cheia public� �n `%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scriu talonul (stub) cheii secrete �n `%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nu am g�sit nici un inel de chei public de scris: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nu am g�sit nici un inel de chei secret de scris: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secret� �i public� au fost create �i semnate.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4183,12 +4188,12 @@ msgstr ""
 "s� folosi�i comanda \"--edit-key\" pentru a genera o subcheie secundar�\n"
 "pentru acest scop.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4196,7 +4201,7 @@ msgstr ""
 "cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4204,690 +4209,690 @@ msgstr ""
 "cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOT�: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 msgid "Really create? (y/N) "
 msgstr "Crea�i �ntr-adev�r? (d/N) "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "stocarea cheii pe card a e�uat: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOT�: copia de siguran�a a cheii cardului salvat� la `%s'\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "niciodat� "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Politic� de semn�turi critic�: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Politic� de semn�turi: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "Server de chei preferat critic: "
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Notare semn�tur� critic�: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Notare semn�tur�: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Inel de chei"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Amprent� cheie primar�:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "     Amprent� subcheie:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr " Amprent� cheie primar�:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "      Amprent� subcheie:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 msgid "      Key fingerprint ="
 msgstr "      Amprent� cheie ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr "      Card nr. serie ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTISMENT: exist� 2 fi�iere cu informa�ii confiden�iale.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s este cel neschimbat\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s este cel nou\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "V� rug�m repara�i aceast� deficien�� posibil� de securitate\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "pun �n cache inelul de chei `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chei puse �n cache p�n� acum (%lu semn�turi)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chei puse �n cache (%lu semn�turi)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: inelul de chei creat\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVERTISMENT: op�iunile serverului de chei `%s' nu sunt folosite pe aceast� "
 "platform�\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 msgid "disabled"
 msgstr "deactivat(�)"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduce�i num�r/numere, N)ext (urm�tor), sau Q)uit (termin�) > "
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cheia \"%s\" nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 msgid "key not found on keyserver\n"
 msgstr "cheia nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "cer cheia %s de la serverul %s %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "cer cheia %s de la %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "trimit cheia %s serverului %s %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "trimit cheia %s lui %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 msgid "no keyserver action!\n"
 msgstr "nici o ac�iune pentru serverul de chei!\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISMENT: manipulator server de chei dintr-o versiune diferit� de GnuPG (%"
 "s)\n"
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr "serverul de chei nu a trimis VERSION (versiune)\n"
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "apeluri c�tre server de chei extern nu este suportat de acest program\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "nici un manipulator (handler) pentru schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "ac�iunea `%s' nu este suportat� cu schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nu suport� versiunea de manipulator (handler) %d\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 msgid "keyserver timed out\n"
 msgstr "serverul de chei a epuizat timpul de a�teptare (timed out)\n"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 msgid "keyserver internal error\n"
 msgstr "eroare intern� server de chei\n"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "eroare de comunicare server de chei: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nu este un ID de cheie: s�rit\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "reactualizez 1 cheie de la %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "reactualizez %d chei de la %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, 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:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s cheie de sesiune cifrat�\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, 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:381
+#: g10/mainproc.c:385
 #, c-format
 msgid "public key is %s\n"
 msgstr "cheia public� este %s\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "date cigrate cu cheie public�: DEK bun\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrat cu cheia %s, ID %s\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decriptarea cu cheie public� a e�uat: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrat� cu %lu fraze-parol�\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrat� cu 1 fraz�-parol�\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "presupunem date cifrate %s\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "decriptare OK\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISMENT: mesajul nu a avut integritatea protejat�\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decriptarea a e�uat: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOT�: expeditorul a cerut \"doar-pentru-ochii-d-voastr�\"\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nume fi�ier original='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocare standalone - folosi�i \"gpg --import\" pentru a aplica\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "verificare semn�tur� eliminat�\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nu pot m�nui aceste semn�turi multiple\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Semn�tur� f�cut� %s\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               folosind cheia %s %s\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "Cheie disponibil� la: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Semn�tur� INCORECT� din \"%s\""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Semn�tur� expirat� din \"%s\""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[nesigur]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Semn�tur� expirat� %s\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Semn�tura expir� %s\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "binar"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "necunoscut"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semn�tura: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "nu o semn�tur� deta�at�\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 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:2045
+#: g10/mainproc.c:2049
 #, 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:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pachet root invalid detectat �n proc_tree()\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nu pot deactiva generarea fi�ierelor core: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat pentru `%s' a e�uat �n %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul cu cheie public� experimental %s\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul de cifrare experimental %s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul rezumat experimental %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin-ul pentru cifrare IDEA nu este prezent\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = arat�-mi mai multe informa�ii\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op�iune �nvechit� \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTISMENT: \"%s\" este o comand� �nvechit� - nu o folosi�i\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "Necompresat"
 
 #
-#: g10/misc.c:732
+#: g10/misc.c:730
 msgid "uncompressed|none"
 msgstr "necompresat|niciunul"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "acest mesaj s-ar putea s� nu poat� fi folosit de %s\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "op�iune ambigu� `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fi�ierul `%s' exist�. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 msgid "Overwrite? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufix necunoscut\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Introduce�i un nou nume-fi�ier"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "scriu la stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "presupun date semnate �n `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "fi�ier de configurare nou `%s' creat\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "AVERTISMENT: op�iunile din %s nu sunt �nc� active �n timpul acestei rul�ri\n"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "director `%s' creat\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nu pot m�nui algoritmul cu cheie public� %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVERTISMENT: cheie de sesiune cifrat� simetric poten�ial nesigur� "
 "(insecure)\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem� cu agentul - deactivez  folosirea agentului\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cheie principal� %s)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4899,28 +4904,28 @@ msgstr ""
 "\"%.*s\"\n"
 "cheia %u-bit %s, ID %s, creat� %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Repeta�i fraza-parol�\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Introduce�i fraza-parol�\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "anulat� de utilizator\n"
 
 #
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr "nu pot cere fraza-parol� �n modul batch\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Introduce�i fraza-parol�: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4929,21 +4934,21 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pentru\n"
 "utilizator: \"%s\"\n"
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cheia %u-bit %s, ID %s, creat� %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subcheie pe cheia principal� ID %s)"
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Repeta�i fraza-parol�: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4959,117 +4964,117 @@ msgstr ""
 "foarte larg�!\n"
 "�ncerca�i s� folosi�i o imagine de aproximativ 240x288 pixeli.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduce�i nume-fi�ier JPEG pentru poz� ID: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nu pot deschide fi�ierul JPEG `%s': %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Acest JPEG este foarte mare (%d octe�i) !\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� �l folosi�i? (d/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' nu este un fi�ier JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Este aceast� poz� corect� (d/N/t)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "nu pot afi�a poza ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "Nici un motiv specificat"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "Cheia este �nlocuit�"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "Cheia a fost compromis�"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "Cheia nu mai este folosit�"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "ID utilizator nu mai este valid"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "motiv pentru revocare: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "comentariu revocare: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMtTsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 msgid "No trust value assigned to:\n"
 msgstr "Nici o valoare de �ncredere atribuit� lui:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  aka \"%s\"\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "C�t de mult crede�i c� aceast� cheie apar�ine �ntr-adev�r utilizatorului "
 "numit?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = Nu �tiu sau nu vreau s� m� pronun�\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = NU am �ncredere\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = Am �ncredere suprem�\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 msgid "  m = back to the main menu\n"
 msgstr "  m = �napoi la meniul principal\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  s = skip this key\n"
 msgstr "  s = s�ri peste cheia asta\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  q = quit\n"
 msgstr "  t = termin�\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5078,42 +5083,42 @@ msgstr ""
 "Nivelul minim de �ncredere pentru aceast� cheie este: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Decizia d-voastr�? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� seta�i aceast� cheie cu �ncredere suprem�? (d/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificatele ce conduc la o cheie cu �ncredere suprem�:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
 "utilizatorului numit\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
 "utilizatorului numit\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 msgid "This key probably belongs to the named user\n"
 msgstr "Aceast� cheie apar�ine probabil utilizatorului numit\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Aceast� cheie ne apar�ine\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5123,111 +5128,111 @@ msgstr ""
 "utilizator.  Dac� �ti�i *cu adev�rat* ce face�i, pute�i\n"
 "r�spunde cu da la urm�toarea �ntrebare.\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 msgid "Use this key anyway? (y/N) "
 msgstr "Folosi�i oricum aceast� cheie? (d/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVERTISMENT: Folosi�i o cheie f�r� �ncredere!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVERTISMENT: aceast� cheie poate fi revocat� (cheia de revocare nu este "
 "prezent�)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� revocatorul desemnat!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Aceasta ar putea �nsemna c� semn�tura e falsificat�.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Not�: Aceast� cheie a fost deactivat�.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Not�: Aceast� cheie a expirat!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "AVERTISMENT: Aceast� cheie nu este certificat� de o semn�tur� de �ncredere!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Nu exist� nici o indica�ie c� semn�tura apar�ine proprietarului.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTISMENT: Noi NU avem �ncredere �n aceast� cheie!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Semn�tura este probabil un FALS.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVERTISMENT: Aceast� cheie nu este certificat� cu suficiente semn�turi de "
 "�ncredere!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nu este sigur c� semn�tura apar�ine proprietarului.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: s�rit�: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: s�rit�: cheia public� este deja prezent�\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Nu a�i specificat un ID utilizator. (pute�i folosi \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr "Destinatari curen�i:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5235,169 +5240,169 @@ msgstr ""
 "\n"
 "Introduce�i ID-ul utilizator.  Termina�i cu o linie nou�: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Nu exist� acest ID utilizator.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "s�rit�: cheia public� setat� deja ca destinatar implicit\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "Cheia public� este deactivat�.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "s�rit�: cheia public� setat� deja\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatar implicit necunoscut \"%s\"\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: s�rit�: cheia public� este deactivat�\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "nici un destinatar valid\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "datele nu au fost salvate: folosi�i op�iunea \"--output\" pentru a le salva\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Semn�tur� deta�at�.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "V� rug�m introduce�i numele fi�ierului de date: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "citesc stdin ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "nici o dat� semnat�\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nu pot deschide date semnate `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinator anonim; �ncerc cheia secret� %s ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, noi suntem destinatarul anonim.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vechea encodare a lui DEK nu este suportat�\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritm cifrare %d%s este necunoscut sau deactivat\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "AVERTISMENT: algoritm cifrare %s nu a fost g�sit �n preferin�ele "
 "destinatarului\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOT�: cheia secret� %s a expirat la %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "NOT�: cheia a fost revocat�"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet a e�uat: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Pentru a fi revocat de:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Aceasta este o cheie de revocare senzitiv�)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Crea�i un certificat de revocare desemnat pentru aceast� cheie? (d/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "Ie�ire �n armur� ASCII for�at�.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet a e�uat: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "nici o cheie de revocare g�sit� pentru \"%s\"\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "nici o cheie public� corespunz�toare: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "cheia public� nu se potrive�te cu cheia secret�!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Crea�i un certificat de revocare pentru aceast� cheie? (d/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "algoritm de protec�ie necunoscut\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOT�: Aceast� cheie nu este protejat�!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5415,121 +5420,121 @@ msgstr ""
 "caz c� mediumul este deteriorat.  Dar fi�i atent: sistemul de tip�rire al\n"
 "ma�inii d-voastr� ar putea p�stra datele �i s� le fac� accesibile altora!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "V� rug�m selecta�i motivul pentru revocare:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "Renun��"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probabil dori�i s� selecta�i %d aici)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduce�i o descriere op�ional�; termina�i cu o linie goal�:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motiv pentru revocare: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(Nici o descriere dat�)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 msgid "Is this okay? (y/N) "
 msgstr "Este aceasta OK? (d/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritm de protec�ie %d%s nu este suportat\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Fraz�-parol� invalid�; v� rug�m mai �ncerca�i o dat�"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVERTISMENT: Cheie slab� detectat� - v� rug�m schimba�i din nou fraza-"
 "parol�.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "generez �nvechitul checksum de 16-bit pentru protec�ia cheii secrete\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "cheie slab� creat� - re�ncerc\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "nu pot evita cheie slab� pentru cifru simetric; am �ncercat %d ori!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVERTISMENT: conflict pentru rezumat semn�tur� �n mesaj\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
 "certified)\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s are o certificare-reciproc� invalid� "
 "(invalid cross-certification)\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "cheie public� %s este mai nou� cu %lu secunde dec�t semn�tura\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5537,7 +5542,7 @@ msgstr ""
 "cheia %s a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5545,52 +5550,35 @@ msgstr ""
 "cheia %s a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOT�: cheia semn�turii %s a expirat %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "presupun semn�tur� incorect� din cheia %s datorit� unui bit critic "
 "necunoscut\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "cheia %s: nici o subcheie pentru semn�tura de revocare a subcheii\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "cheia %s: nici o subcheie pentru semn�tura legat� de subcheie\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "nu pot pune date notare �n semn�turi v3 (stil PGP 2.x)\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "nu pot pune date notare �n semn�turi de chei v3 (stil PGP 2.x)\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVERTISMENT: nu pot %%-expanda notarea (prea mare).  Folosesc neexpandat.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "nu pot pune un URL de politic� �n semn�turi v3 (stil PGP 2.x)\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"nu pot pune un URL de politic� �n semn�turi de chei v3 (stil PGP 2.x)\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5598,7 +5586,7 @@ msgstr ""
 "AVERTISMENT: nu pot %%-expanda URL-ul de politici (prea mare).  �l folosesc "
 "neexpandat.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5607,21 +5595,21 @@ msgstr ""
 "AVERTISMENT: nu pot %%-expanda URL-ul serverului de chei (prea mare).  �l "
 "folosesc neexpandat.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s semn�tur� de la: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "pute�i semna-data�at cu chei stil PGP 2.x numai �n modul --pgp2\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5629,49 +5617,49 @@ msgstr ""
 "AVERTISMENT: for�area algoritmului rezumat %s (%d) violeaz� preferin�ele "
 "destinatarului\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "semnare:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "pute�i semna-�n-clar cu chei stil PGP 2.x �n modul --pgp2\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "va fi folosit� cifrarea %s\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "cheia nu este marcat� ca sigur� - nu o pot folosi cu GNA falsificat!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "s�rit� \"%s\": duplicat�\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "s�rit� \"%s\": %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "s�rit�: cheia secret� deja prezent�\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "aceasta este o cheie ElGamal generat� de PGP care nu e sigur� pentru "
 "semn�turi!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "�nregistrare �ncredere %lu, tip %d: scrierea a e�uat: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5680,344 +5668,344 @@ msgstr ""
 "# List� cu valori de �ncredere atribuite, creat� %s\n"
 "# (Folosi�i \"gpg --import-ownertrust\" pentru a le reface)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "eroare �n `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "linie prea lung�"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "caracter : lips�"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "amprent� invalid�"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "lipse�te valorea �ncrederii �n proprietari (ownertrust)"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "eroare g�sire �nregistrare �ncredere �n `%s': %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "eroare citire �n `%s': %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sincronizarea a e�uat: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek a e�uat: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrierea a e�uat (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "tranzac�ia trustdb prea mare\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: directorul nu exist�!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "nu pot crea �ncuietoare (lock) pentru `%s'\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "nu pot �ncuia (lock) `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: am e�uat s� creez �nregistrare versiune: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: a fost creat trustdb invalid\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: a fost creat trustdb\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "NOT�: nu poate fi scris �n trustdb\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb invalid\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: am e�uat s� creez hashtable: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eroare actualizare �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eroare citire �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eroare scriere �nregistrare versiune: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek a e�uat: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: citirea a e�uat (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nu e un fi�ier trustdb\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: �nregistrare versiune cu recnum %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versiune fi�ier invalid� %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eroare citire �nregistrare liber�: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eroare scriere �nregistrare dir: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: eroare setere la zero a �nregistr�rii: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: ad�ugarea unei �nregistr�ri a e�uat: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb este corupt�; rula�i \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nu pot m�nui linii de text mai lungi de %d caractere\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linii de intrare mai lungi de %d caractere\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' nu este un ID-cheie de lungime valid�\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "cheia %s: acceptat� ca cheie de �ncredere\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "cheia %s apare de mai multe ori �n trustdb\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "cheia %s: nici o cheie public� pentru cheia de �ncredere - s�rit�\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "cheia %s marcat� ca av�nd �ncredere suprem�\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "�nregistrare �ncredere %lu, tip req %d: citirea a e�uat: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "�nregistrare �ncredere %lu nu este de tipul cerut %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "nu pot folosi model de �ncredere (%d) - presupun model de �ncredere %s\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "folosesc model de �ncredere %s\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 traduc�tor vezi trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[revocat�]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[expirat�] "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[necunoscut�]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[  nedef ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[marginal]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[ deplin�]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[ suprem�]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "nedefinit�"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "niciodat�"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "deplin�"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "suprem�"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "nu e nevoie de o verificare trustdb\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "urm�toarea verificare trustdb programat� pe %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "nu e nevoie de o verificare trustdb cu modelul de �ncredere `%s'\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nu e nevoie de o actualizare trustdb cu modelul de �ncredere `%s'\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "cheia public� %s nu a fost g�sit�: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "v� rug�m face�i un --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "verific trustdb\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chei procesate (%d num�r�tori valide anulate)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "cheia public� a cheii cu �ncredere suprem� %s nu a fost g�sit�\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d marginal(e) necesare, %d complet(e) necesare, model de �ncredere %s\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "ad�nc: %d  valid: %3d  semnat: %3d  �ncredere: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 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:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6032,307 +6020,320 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linia de intrare %u prea lung� sau lipse�te LF\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "eroare general�"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "tip de pachet necunoscut"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "versiune necunoscut�"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "algoritm pubkey necunoscut"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "algoritm rezumat necunoscut"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "cheie public� incorect�"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "cheie secret� incorect�"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "semn�tur� incorect�"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "eroare checksum"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "fraz�-parol� incorect�"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "cheia public� nu a fost g�sit�"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "algoritm cifrare necunoscut"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "nu pot deschide inelul de chei"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "pachet invalid"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "armur� invalid�"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "nu exist� acest id utilizator"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "cheia secret� nu e disponibil�"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "a fost folosit� o cheie secret� gre�it�"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "nu este suportat(�)"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "cheie incorect�"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "eroare citire fi�ier"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "eroare scriere fi�ier"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "algoritm compresie necunoscut"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "eroare deschidere fi�ier"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "eroare creare fi�ier"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "fraz�-parol� invalid�"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritm pubkey neimplementat"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "algoritm cifrare neimplementat"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "clas� semn�turi necunoscut�"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "eroare baz� de date �ncredere"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "MPI incorect"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "limit� resurse"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "inel de chei invalid"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "certificat incorect"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "id utilizator anormal"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "eroare �nchidere fi�ier"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "eroare redenumire fi�ier"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "eroare �tergere fi�ier"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "date nea�teptate"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "conflict timestamp"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "algoritm pubkey nefolosibil"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "fi�ierul exist�"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "cheie slab�"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "argument invalid"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "URI incorect"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "URI nesuportat"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "eroare re�ea"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "necifrat"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "neprocesat"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "cheie public� de nefolosit"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "cheie secret� de nefolosit"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "eroare server de chei"
 
-#: util/errors.c:109
+#: util/errors.c:107
 msgid "canceled"
 msgstr "anulat�"
 
-#: util/errors.c:110
+#: util/errors.c:108
 msgid "no card"
 msgstr "nici un card"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "nici o dat� semnat�\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr "EROARE: "
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr "AVERTISMENT: "
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... acesta este un bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "a�i g�sit un bug ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "da"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "dD"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "nu"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "termin�"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "tT"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr "OK|OK"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr "renun��|renun��"
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "AVERTISMENT: este folosit� memorie neprotejat� (insecure)!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "vede�i http://www.gnupg.org/faq.html pentru informa�ii suplimentare\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 "opera�ia nu este posibil� f�r� memorie protejat� (secure) ini�ializat�\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "nu pot pune date notare �n semn�turi v3 (stil PGP 2.x)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr "nu pot pune date notare �n semn�turi de chei v3 (stil PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "nu pot pune un URL de politic� �n semn�turi v3 (stil PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "nu pot pune un URL de politic� �n semn�turi de chei v3 (stil PGP 2.x)\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA necesit� folosirea unui algoritm cu hash de 160 bi�i\n"
 
diff --git a/po/ru.po b/po/ru.po
index 814807678..cdfccaa14 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 1.4.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+0200\n"
 "PO-Revision-Date: 2005-06-22 02:53+0200\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -16,90 +16,90 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "не могу сгенерировать простое число с pbits=%u qbits=%u\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "не могу сгенерировать простое число меньше чем с %d битами\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "не найден модуль накопления энтропии\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "невозможно заблокировать `%s'\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "не могу выполнить stat `%s': %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' не регулярный файл - проигнорирован\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "замечание: файл random_seed пуст\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "ВНИМАНИЕ: недопустимый размер файла random_seed - не использую\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "не могу прочитать `%s': %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "замечание: файл random_seed не обновлен\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "не могу записать `%s': %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "не могу закрыть `%s': %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ВНИМАНИЕ: используется небезопасный генератор случайных чисел!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -114,7 +114,7 @@ msgstr ""
 "НЕ ПОЛЬЗУЙТЕСЬ ДАННЫМИ СОЗДАННЫМИ ЭТОЙ ВЕРСИЕЙ ПРОГРАММЫ!!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -124,7 +124,7 @@ msgstr ""
 "Вы можете выполнять в это время какую-нибудь работу, это спасет от скуки\n"
 "и увеличит качество и скорость сбора случайных данных.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -135,62 +135,62 @@ msgstr ""
 "Недостаточно случайных чисел.  Выполняйте какие-либо действия для того,\n"
 "чтобы ОС могла получить больше случайных данных! (Необходимо ещё %d байт)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "сбой сохранения отпечатка: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "сбой сохранения даты создания: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "сбой при чтении ключа: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr "ответ не содержит данных открытого ключа\n"
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr "в ответе отсутствует модуль RSA\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr "в ответе отсутствует открытая экспонента RSA\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "при проверке CHV%d сбой: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr "доступ к командам управления не настроен\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr "ошибка получения статуса CHV с карты\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr "карта заблокирована!\n"
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -199,345 +199,350 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr "|A|Административный PID"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Новый административный PIN"
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr "|N|Новый PIN"
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "ошибка при получении нового PIN: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 msgid "error reading application data\n"
 msgstr "ошибка чтения данных приложения\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 msgid "error reading fingerprint DO\n"
 msgstr "ошибка чтения отпечатка DO\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 msgid "key already exists\n"
 msgstr "ключ уже существует\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr "существующий ключ будет заменен\n"
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 msgid "generating new key\n"
 msgstr "генерация нового ключа\n"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr "пропущен штамп создания создания\n"
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Модули RSA пропущены или не имеют размер %d бит\n"
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "отсутствует открытая экспонента RSA или превышает %d бит\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Простое число RSA %s пропущено или не имеет размер %d бит\n"
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "сбой сохранения ключа: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 msgid "generating key failed\n"
 msgstr "сбой при генерации ключа\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "ключ сгенерирован (%d секунд)\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "недопутимая структура OpenPGP карты (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "подписей создано: %lu\n"
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Введите PIN%%0A[подписей: %lu]"
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "проверка административного PIN в данный момент запрещен этой командой\n"
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "формат ASCII: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "неправильный заголовок ASCII: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "заголовок ASCII: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "неправильный заголовок прозрачной подписи\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "заголовок ASCII: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "вложенные прозрачные подписи\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 msgid "unexpected armor: "
 msgstr "неожиданный формат ASCII:"
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "неправильный отступ из минусов: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "недопустимый символ radix64 %02X пропущен\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "преждевременный конец файла (нет CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "преждевременный конец файла (в CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "поврежденный CRC\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "ошибка CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 msgid "premature eof (in trailer)\n"
 msgstr "преждевременный конец файла (в дополнении)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "ошибка в строке дополнения\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "не найдено данных формата OpenPGP.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "неправильный ASCII формат: строка длиннее %d символов\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "символы quoted printable в кодировке ASCII - вероятно использовался плохой "
 "MTA\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Карта OpenPGP недоступна: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s \n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Ваш выбор (?-подробнее)? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr "[не установлено]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 msgid "male"
 msgstr "мужской"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "female"
 msgstr "женский"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "unspecified"
 msgstr "не задан"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "not forced"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Ошибка:Допустим только чистый ASCII.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Ошибка: Нельзя использовать символ \"<\"\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Ошибка: Двойные пробелы недопустимы.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr "Фамилия владельца карты:"
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr "Имя влдаельца карты:"
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Ошибка: Скомбинированное имя слишком длинное (предел %d символов).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 msgid "URL to retrieve public key: "
 msgstr "URL для получения открытого ключа: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Ошибка: URL слишком длинный (предел - %d символов).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "ошибка чтения `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr "Учетная запись (имя):"
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Ошибка: Данные учетной записи слишком длинные (предел %d символов).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr "Секретные DO данные:"
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Ошибка: Секретные DO данные слишком длинные (предел %d символов).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 msgid "Language preferences: "
 msgstr "Предпочитаемый язык: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ошибка: недопустимая длина строки предпочтений.\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ошибка: недопустимые символы в строке предпочтений.\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Пол ((M)Мужской, (F)Женский или пробел): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 msgid "Error: invalid response.\n"
 msgstr "Ошибка: недопустимый ответ.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 msgid "CA fingerprint: "
 msgstr "отпечаток CA: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Ошибка: неправильный формат отпечатка.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "операция с ключом невозможна: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 msgid "not an OpenPGP card"
 msgstr "карта не OpenPGP"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "ошибка при считывании информации ключа: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr "Заменить существующий ключ? (y/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr "Заменить существующие ключи? (y/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -548,140 +553,140 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Вы должны изменить их используя команду --change-pin\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 msgid "Please select the type of key to generate:\n"
 msgstr "Выберите тип создаваемого ключа:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 msgid "   (1) Signature key\n"
 msgstr "   (1) Ключ подписи\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Ключ шифрования\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ аутентификации\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 msgid "Please select where to store the key:\n"
 msgstr "Выберите, где сохранить ключ:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 msgid "unknown key protection algorithm\n"
 msgstr "неизвестный алгоритм защиты ключа\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 msgid "secret parts of key are not available\n"
 msgstr "секретные части ключа недоступны\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 msgid "secret key already stored on a card\n"
 msgstr "секретный ключ уже сохранен в карте\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "show admin commands"
 msgstr "показать управляющие команды"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "показать данную справку"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "list all available data"
 msgstr "вывести все доступные данные"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr "изменить имя владельца карты"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr "изменить URL получения ключа"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr "запросить ключ, указанный по заданному картой URL"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change the login name"
 msgstr "изменить учетное имя"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "change the language preferences"
 msgstr "изменить языковые предпочтения"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr "изменение пола владельца карты"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "change a CA fingerprint"
 msgstr "сменить отпечаток CA"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 #, fuzzy
 msgid "toggle the signature force PIN flag"
 msgstr "переключение флага force PIN"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 msgid "generate new keys"
 msgstr "сгенерировать новые ключи"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr "меню изменения или разблокировки PIN"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 #, fuzzy
 msgid "verify the PIN and list all data"
 msgstr "проверить PIN  и показать все данные"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Команда> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 msgid "Admin-only command\n"
 msgstr "Команды администратора\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 msgid "Admin commands are allowed\n"
 msgstr "Команды администрирования разрешены\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 msgid "Admin commands are not allowed\n"
 msgstr "Команды администрирования не разрешены\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "секретный ключ не найден"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Вставьте карту и нажмите Enter или введите 'c' для отмены: "
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "сбой при удалении блока ключа: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -690,301 +695,301 @@ msgstr ""
 "Извлеките текущую карту и вставьте карту с серийным номером:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Нажмите Enter, когда будете готовы или введите 'c' для отмены: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr "Введите новый Admin PIN: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr "Введите новый PIN: "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr "Введите Admin PIN: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr "Введите PIN: "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 msgid "Repeat this PIN: "
 msgstr "Повторите ввод PIN: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 msgid "PIN not correctly repeated; try again"
 msgstr "повторный ввод PIN некорректен; попробуйте еще раз"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "ошибка чтения блока ключей: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(если только Вы не задали ключ отпечатком)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "не могу выполнить в пакетном режиме без \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Удалить данный ключ из таблицы ключей? (y/N)"
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Это секретный ключ! - действительно удалить? (y/N)"
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "сбой при удалении блока ключа: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "информация о доверии владельцу очищена\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "имеется секретный ключ для открытого ключа \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "сначала используйте опцию \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "не могу использовать симметричный пакет ESK в S2K режиме\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "используемый алгоритм шифрования %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' уже сжат\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ВНИМАНИЕ: `%s' пустой файл\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "в режиме --pgp2 ключ RSA для ширования должен быть не более 2048 бит\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "читаю из `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "не могу использовать шифр IDEA для всех ключей.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ВНИМАНИЕ: использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "ВНИМАНИЕ: сжатие алгоритмом %s (%d) нарушает предпочтения получателя\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Вы не можете использовать %s в режиме %s\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано для: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "Данные зашифрованы алгоритмом %s\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано неизвестным алгоритмом %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ВНИМАНИЕ: сообщение было зашифровано слабым ключом симметричного шифра.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "проблема обработки зашифрованного пакета\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "удаленный запуск программы не поддерживается\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "не могу создать каталог `%s': %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "вызов внешних программ отключен из-за небезопасных прав доступа\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "на данной платформе требуется использование временных файлов при вызове "
 "внешних программ\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "не могу запустить программу `%s': %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "не могу запустить оболочку `%s': %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "ошибка системы при вызове внешней программы: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "ненормальное завершение внешней программы\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "не могу запустить внешнюю программу\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "не могу прочитать ответ внешней программы: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "ВНИМАНИЕ: не могу удалить временный файл (%s) `%s': %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ВНИМАНИЕ: не могу удалить временный каталог `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "Подпись будет помечена как не отзываемая.\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "ключи отзыва для \"%s\" не найдены\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "отзыв ключа или выбранных подключей"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "удаление неиспользуемых частей из ключа"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 msgid "exporting secret keys not allowed\n"
 msgstr "экспорт секретных ключей не разрешен\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "ключ %s: не защищен - пропущен\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "ключ %s: стиля PGP 2.x - пропущен\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "сбой сохранения ключа: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ВНИМАНИЕ: секретный ключ %s не имеет простой контрольной суммы SK\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "ВНИМАНИЕ: нечего экспортировать\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -992,127 +997,127 @@ msgstr ""
 "@Команды:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[file]|создать подпись к файлу"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|создать прозрачную подпись к файлу"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать только симметричным шифром"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "вывести список ключей"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "вывести список ключей и подписей"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи ключей"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей и их отпечатков"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "создать новую пару ключей"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы закрытых ключей"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "подписать ключ"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "подписать ключ локально"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "подписать или редактировать ключ"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "создать сертификат отзыва"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "импортировать ключи с сервера ключей"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "искать ключи на сервере ключей"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "обновить все ключи с сервера ключей"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr "показать состояние карты"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr "изменить данные на карте"
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr "сменить PIN карты"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "обновить таблицу доверий"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|вывести хэши файлов"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1122,51 +1127,51 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "использовать данный User ID для подписывания и расшифрования"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|установить уровень сжатия N (по умолчанию - 0)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "вывод в указанный файл"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "подробно"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "спросить перед перезаписью"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr "строго следовать стандарту OpenPGP"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr "создает сообщение совместимым с PGP 2.x"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1174,7 +1179,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1194,15 +1199,15 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "О найденных ошибка сообщайте <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1212,7 +1217,7 @@ msgstr ""
 "подписать и проверить, зашифровать или расшифровать\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1220,92 +1225,92 @@ msgstr ""
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [опции] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "отсутствует знак = в определении группы `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к домашнему каталогу `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу конфигурации `%s'\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу модуля расширения `%s'\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего домашний каталог `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего файл конфигурации `%s'\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего модуль расширения `%s'\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему домашний каталог "
 "`%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1313,557 +1318,557 @@ msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему файл "
 "конфигурации `%s'\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему файл модуля "
 "расширения `%s'\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "переключение между просмотром открытых и закрытых ключей"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации взяты из файла `%s'\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для нормального применения!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "расширение шифра `%s' не загружено вследствие небезопасных прав доступа\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
 # test it
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
 # test it
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
 # test it
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
 # test it
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
 # test it
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "ПРЕДУПРЕЖДАЮ: %s недоступен в данной версии\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Вы не можете одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Вы должны использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s!\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [имяфайла]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [имяфайла]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "слишком много входов в pk кэше - отключено\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 msgid "[User ID not found]"
 msgstr "[User ID не найден]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Дефектный ключ %s признан пригодным согласно параметра --allow-non-"
 "selfsigned-uid\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "использую подклключ %s вместо главного ключа %s\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "уменьшить количество выводимой информации"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "используются ключи из этой таблицы ключей"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "при несоответствии отметки времени - только предупреждением"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить инфромацию в файл с дескриптором FD"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Использовать: gpgv [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1871,7 +1876,7 @@ msgstr ""
 "Синтаксис: gpg [параметры] [файлы]\n"
 "Проверка подписей сделанных доверяемыми ключами\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1881,7 +1886,7 @@ msgstr ""
 "третьей стороне.  Это необходимо для реализации сети доверия web-of-trust;\n"
 " и не имеет ничего общего с (неявно созданной) сетью сертификатов."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1893,17 +1898,17 @@ msgstr ""
 "секретный ключ.  Ответьте \"yes\" для присвоения абсолютного доверия\n"
 "данному ключу\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Если Вы хотите использовать данный недоверяемый ключ - ответьте \"yes\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Введите User ID адресата, которому Вы хотите отправить сообщение."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1927,7 +1932,7 @@ msgstr ""
 "\n"
 "Первый (главный) ключ всегда должен быть подписывающим."
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1938,16 +1943,16 @@ msgstr ""
 "Проконсультируйтесь с Вашим экспертом по безопасности перед тем,\n"
 "как использовать данный ключ."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Введите размер ключа"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Ответьте \"yes\" или \"no\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1959,19 +1964,19 @@ msgstr ""
 "уведомление при ошибке в формате - вместо этого система попробует\n"
 "интерпретировать введенное Вами значение как интервал."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Введите имя владельца ключа"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "введите необязательный, но очень рекомендуемый email адрес"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Введите необязательный комментарий"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1985,11 +1990,11 @@ msgstr ""
 "O  продолжить создание ключа.\n"
 "Q  выйти и прервать создание ключа."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Ответьте \"yes\" (или только \"y\"), если Вы готовы создавать подключ."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2058,11 +2063,11 @@ msgstr ""
 "\n"
 "Если Вы не можете определиться с правильным ответом, ответьте \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Ответьте \"yes\", если Вы хотите подписать ВСЕ User ID"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2070,11 +2075,11 @@ msgstr ""
 "Ответьте \"yes\", если Вы действительно хотите удалить данный User ID.\n"
 "Все сертификаты также будут потеряны!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Ответьте \"yes\", если Вы готовы удалить подключ"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2084,7 +2089,7 @@ msgstr ""
 "удалять такие подписи, потому, что она может быть важна для установления\n"
 "достоверности ключа или других ключей подписанных данным ключом."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2096,7 +2101,7 @@ msgstr ""
 "узнаете, какой ключ был использован, т.к. эта подпись может\n"
 "устанавливать достоверность через другие уже удостоверенные ключи."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2104,7 +2109,7 @@ msgstr ""
 "Подпись недействительна.  Это дает основания удалить ее из\n"
 "Вашей связки ключей."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2118,7 +2123,7 @@ msgstr ""
 "Делайте это только если данная самоподпись не действительна по\n"
 "каким-то причинам и существует доступная вторая."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2128,24 +2133,24 @@ msgstr ""
 "на текущий список предпочтений.  Отметка времени на всех затронутых\n"
 "самоподписях будет увеличена на одну секунду\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Введите парольную фразу (это секретная строка) \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Повторите парольную фразу, чтобы убедиться в том, что она набрана правильно."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Введите имя файла, к которому относится данная подпись"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Ответьте \"yes\", если Вы хотите перезаписать файл"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2153,7 +2158,7 @@ msgstr ""
 "Введите новое имя файла. Если Вы нажмете только RETURN будет использован\n"
 "по умолчанию тот файл, который показан в квадратных скобках."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2182,7 +2187,7 @@ msgstr ""
 "      Обычно используется, для указания, что данный e-mail больше\n"
 "      не используется\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2192,534 +2197,534 @@ msgstr ""
 "причины создания сертификата отзыва.  Будьте кратки.\n"
 "Для завершения введите пустую строку.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Нет доступной справки"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Нет справки для `%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "обновить таблицу доверий"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "открытый ключ не соотвествует секретному!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "удаление неиспользуемых частей из ключа"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "пропущен блок типа %d\n"
 
 # test it
-#: g10/import.c:276
+#: g10/import.c:274
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu ключей обработано\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Всего обработано: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        пропущено новых ключей: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                   без User ID: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 импортировано: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  неизмененных: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                 новых User ID: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               новых подключей: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                новых подписей: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          новых отзывов ключей: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "    прочитано секретных ключей: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "импортировано секретных ключей: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " неизменённых секретных ключей: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              не импортировано: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    подписей очищено: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      очищено User ID: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, fuzzy, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "ВНИМАНИЕ: ключ %s содержит недопустимые предпочтения\n"
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "алгоритмы для этих User ID:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": предпочитает шифр %s\n"
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": предпочитает хеш-функцию %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": предпочитает сжатие %s\n"
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "крайне желательно, чтобы Вы обновили Ваши предпочтения и\n"
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "распространили этот ключ, чтобы избежать потенциальных проблем несовпадения "
 "алгоритмов\n"
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "Вы можете обновить список предпочтений используя:\n"
 "\tgpg --edit-key %s updpref save\n"
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %s: не имеет User ID\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ключ %s: PKS повреждение ключа исправлено\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "ключ %s: принят без самоподписанного User ID \"%s\"\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ключ %s: нет действительных User ID\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "причиной этого может быть отсутствие самоподписи\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %s: не найден открытый ключ: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ключ %s: новый ключ - пропущен\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "сохраняю в `%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "ошибка записи таблицы ключей `%s': %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ключ %s: открытый ключ \"%s\" импортирован\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %s: не совпадает с копией хранимой у нас\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %s: не нахожу оригинальный блок ключей: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %s: не могу прочитать оригинальный блок ключей: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %s: \"%s\" 1 новый User ID\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ключ %s: \"%s\" %d новых User ID\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ключ %s: \"%s\" 1 новая подпись\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ключ %s: \"%s\" %d новых подписей\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ключ %s: \"%s\" 1 новый подключ\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ключ %s: \"%s\" %d новых подключей\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "ключ %s: \"%s\" %d подпись очищена\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "ключ %s: \"%s\" %d очищеных подписей\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "ключ %s: \"%s\" %d User ID очищен\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "ключ %s: \"%s\" %d  очищенных User ID\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %s: \"%s\" не изменен\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "импортирование секретного ключа не позволено\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "нет основной таблицы секретных ключей: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %s: секретный ключ импортирован\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "ключ %s: уже есть в таблице секретных ключей\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "ключ %s: не найден секретный ключ: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - отвергнут\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %s: \"%s\" сертификат отзыва импортирован\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %s: нет User ID для подписи\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: неподдерживаемый алгоритм с открытым ключом у User ID \"%s\" \n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "ключ %s: неправильная самоподпись на User ID \"%s\"\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %s: нет подключа для связывания подключей\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %s: неподдерживаемый алгоритм с открытым ключом\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %s: неправильная связь подключей\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %s: удалено многократное связывание подключей\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %s: нет подключа для отзывающего ключа\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %s: неправильный отзыв подключа\n"
 
 # test it
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %s: удалена многожественность подключей отзыва\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %s: пропущен User ID \"%s\"\n"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %s: пропущен подключ\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ключ %s: не экспортируемая подпись (класс 0x%02X) - пропущена\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - пропущен\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неизвестный класс подписи (0x%02X) - пропущена\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ключ %s: обнаружено дублирование User ID - объединены\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: запрашиваю ключ отзыва %s\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: ключ отзыва %s не получен.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: \"%s\" добавлен сертификат отзыва\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: direct key signature добавлена\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "ПРЕДУПРЕЖДАЮ: S/N ключа не соответствует S/N ключа на карте\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: главный ключ готов и сохранен в карте\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: вторичный ключ готов и сохранен в карте\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "ошибка создания таблицы ключей `%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "создана таблица ключей `%s'\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr ""
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "сбой перестройки кэша таблицы ключей: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[отозван]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[самоподпись]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 плохая подпись\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d плохих подписей\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 подпись не проверена за отсутствием ключа\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d подписей не проверено за отсутствием ключей\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 подпись не проверена из-за ошибки\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d подписей не проверено из-за ошибок\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "обнаружен 1 User ID без действительной самоподписи\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "обнаружено %d User ID без действительной самоподписи\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2731,17 +2736,17 @@ msgstr ""
 "Проверяет паспорт, сверяет отпечатки ключей и т.п.?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Доверяю ограниченно\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Полностью доверяю\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2752,47 +2757,47 @@ msgstr ""
 "trust signatures on your behalf.\n"
 
 # check it
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Введите домен, ограничивающий использование данной подписи, или пустую "
 "строку, если нет ограничений.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" отозван."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Вы уверены, что хотите это подписать? (y/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  Не могу подписать.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" просрочен."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" без самоподписи."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID \"%s\"  подписываем."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2801,11 +2806,11 @@ msgstr ""
 "Самоподпись у \"%s\"\n"
 "это подпись PGP 2.x -стиля.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Вы хотите сделать это OpenPGP самоподписью? (y/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2814,11 +2819,11 @@ msgstr ""
 "Ваша текущая подпись на  \"%s\"\n"
 "просрочена.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2827,55 +2832,55 @@ msgstr ""
 "Ваша текущая подпись на \"%s\"\n"
 "является локальной.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Вы хотите сделать это полностью экспортируемой подписью? (y/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" уже локально подписан ключом %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" уже подписан ключом %s\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Вы действительно хотите снова подписать это? (y/N)"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Нечего подписывать ключом %s\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Данный ключ просрочен!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Срок действительности данного ключа истекает %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Вы хотите, чтобы Ваша подпись была действительна до того же времени?(Y/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Вы не можете сделать OpenPGP подпись на PGP 2.x ключе в режиме --pgp2.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Это сделает ключ несовместимым с PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2885,31 +2890,31 @@ msgstr ""
 "чье имя указано в User ID ключа?\n"
 "  Если Вы не знаете что ответить, введите \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Не буду отвечать.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Я не проверял совсем.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Я проверил частично.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Я проверил очень тщательно.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ваше решение? (введите '?' для получения информации)"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2918,74 +2923,74 @@ msgstr ""
 "Вы уверены, что хотите подписать этот ключ\n"
 "своим ключом: \"%s\" (%s)\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 msgid "This will be a self-signature.\n"
 msgstr "Это будет самоподпись.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ВНИМАНИЕ: подпись не будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "ВНИМАНИЕ: подпись не будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Подпись будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Подпись будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "I have not checked this key at all.\n"
 msgstr "Я совсем не проверял этот ключ.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 msgid "I have checked this key casually.\n"
 msgstr "Я проверил этот ключ только частично.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 msgid "I have checked this key very carefully.\n"
 msgstr "Я очень тщательно проверил этот ключ.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "не удалось подписать: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Данный ключ не защищен.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретная часть главного ключа сохранена на карте.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "Ключ защищен.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Не могу редактировать данный ключ: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2993,11 +2998,11 @@ msgstr ""
 "Введите новый пароль для данного секретного ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "повторный ввод пароля некорректен; попробуйте еще раз"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3005,186 +3010,186 @@ msgstr ""
 "Вы не хотите задать пароль? Это очень ПЛОХАЯ идея!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 msgid "Do you really want to do this? (y/N) "
 msgstr "Вы действительно хотите сделать это? (y/N)"
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "перемещение подписи ключа в правильное место\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "сохранить и выйти"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "показать отпечаток ключа"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "вывести список ключей и User ID"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "выбрать User ID N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "выбрать подключ N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "проверка подписей"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "подписать выбранные User ID [* описание соотв. команд см. ниже]"
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs locally"
 msgstr "локально подписать выбранные User ID"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a trust signature"
 msgstr "подписать выбранные User ID - trust подписью"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "подписать выбранные User ID без возможности отзыва"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "добавить User ID"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "добавить фото ID"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 msgid "delete selected user IDs"
 msgstr "удалить выбранные User ID"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "add a subkey"
 msgstr "добавить подключ"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr "добавить ключ на карту"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr "переместить ключ на карту"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 msgid "delete selected subkeys"
 msgstr "удалить выбранные подключи"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "добавить ключ отзыва"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 msgid "delete signatures from the selected user IDs"
 msgstr "удалить подписи у выбранных User ID"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "сменить срок действительности ключа или выбранных подключей"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 msgid "flag the selected user ID as primary"
 msgstr "пометить выбранные User ID как главные"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 msgid "toggle between the secret and public key listings"
 msgstr "переключение между просмотром открытых и закрытых ключей"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "список предпочтений (экспертам)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "список предпочтений (подробный)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "set preference list for the selected user IDs"
 msgstr "установить список предпочтений для выбранных User ID"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "установить URL предпочитаемого сервера ключей для выбранных User ID"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "установить список предпочтений для выбранных User ID"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "сменить пароль"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 msgid "revoke signatures on the selected user IDs"
 msgstr "отозвать подписи у выбранных User ID"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 msgid "revoke selected user IDs"
 msgstr "отзыв выбранных User ID"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "revoke key or selected subkeys"
 msgstr "отзыв ключа или выбранных подключей"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 msgid "enable key"
 msgstr "включить ключ"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 msgid "disable key"
 msgstr "отключить ключ"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 msgid "show selected photo IDs"
 msgstr "показать выбранные фото ID"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "ошибка чтения секретного блока ключа \"%s\": %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Секретный ключ доступен.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Для данного действия нужен секретный ключ.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Сначала воспользуйтесь командой \"toggle\".\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3196,157 +3201,157 @@ msgstr ""
 "  `t' - trust подпись (tsign), `nr' - без возможности отзыва\n"
 "  (nrsign) или любым их сочетанием (ltsign, tnrsign и т.д.).\n"
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "Ключ отозван."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Вы действительно хотите подписать ВСЕ User ID? (y/N)"
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Подсказка: Выберите User IDs для подписи\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "неизвестный тип подписи `%s'\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Данная команда не допустима в режиме %s.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Вы должны выбрать хотя бы один User ID.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Вы не можете удалить последний User ID!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Вы действительно хотите удалить ВСЕ выбранные User IDs? (y/N)"
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 msgid "Really remove this user ID? (y/N) "
 msgstr "Вы действительно хотите удалить данный User ID? (y/N)"
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 msgid "Really move the primary key? (y/N) "
 msgstr "Действительно удалить главный ключ? (y/N)"
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 msgid "You must select exactly one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr "Команда ожидает аргумент - имя файла\n"
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Не могу открыть `%s': %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Вы действительно хотите удалить выбранные ключи? (y/N)"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Вы действительно хотите удалить данный ключ? (y/N)"
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Действительно отозвать ВСЕ выбранные User ID? (y/N)"
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Действительно отозвать данный User ID? (y/N)"
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Вы действительно хотите отозвать ключ целиком? (y/N)"
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Вы действительно хотите отозвать выбранные подключи? (y/N)"
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Вы действительно хотите отозвать данный подключ? (y/N)"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Невозможно присвоить степень доверия пока используется указанная "
 "пользователем таблица доверий\n"
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 msgid "Set preference list to:\n"
 msgstr "установить предпочтения в:\n"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Действительно обновить предпочтения для выбранных User ID? (y/N)"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 msgid "Really update the preferences? (y/N) "
 msgstr "Действительно обновить предпочтения? (y/N)"
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 msgid "Save changes? (y/N) "
 msgstr "Сохранить изменения? (y/N)"
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без сохранения? (y/N)"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "сбой при обновлении: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "сбой при обновлений секретного ключа: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "ключ не изменялся - обновление не нужно.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Хэш-функции: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Опции: "
 
 # check it
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Предпочитаемый сервер ключей: "
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3354,71 +3359,71 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Данный ключ был отозван %s - %s ключом %s\n"
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван %s ключом %s "
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, c-format
 msgid "created: %s"
 msgstr "создан: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, c-format
 msgid "revoked: %s"
 msgstr "отозван: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "просрочен с: %s"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, c-format
 msgid "expires: %s"
 msgstr "годен до: %s"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, c-format
 msgid "usage: %s"
 msgstr "применяемость: %s"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr "достоверность: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3426,18 +3431,18 @@ msgstr ""
 "Учтите, что показанные степени достоверности могут быть неверными,\n"
 "пока Вы не перезапустите программу.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "просрочен с"
 
 # check it
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3445,7 +3450,7 @@ msgstr ""
 "ВНИМАНИЕ: нет User ID помеченного как главный.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3454,74 +3459,74 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Вы не можете добавить фото ID в ключ PGP2-типа.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Удалена %d подпись.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Удалено %d подписи.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "недопустимый"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\" уже очищен\n"
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ключ %s: \"%s\" %d подпись очищена\n"
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ключ %s: \"%s\" %d очищеных подписей\n"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\" уже очищен\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" уже очищен\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3530,359 +3535,359 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Вы не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить ключ PGP 2.x отзывающим\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "этот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим невозможно будет отменить!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N)"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 msgid "Please select at most one subkey.\n"
 msgstr "Выделите не менее одного подключа.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действительности подключа.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Вы не можете изменить срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "ВНИМАНИЕ: подписываемый подключ %s не имеет перекрестной сертификации\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы действительно хотите заменить его? (y/N)"
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы действительно хотите удалить его? (y/N)"
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Примечание к подписи"
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Перезаписать (y/N)? "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Нет User ID с хешем %s\n"
 
 # c-format
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Нет подключа с индексом %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \"%s\"\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подписано Вашим ключом %s от %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок действительности подписи закончился %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID на ключе %s:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 msgid " (non-revocable)"
 msgstr " (не отзываемая)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отзыв Вашим ключом %s от %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ %s фото ID размера %ld для ключа %s (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "предпочтение `%s' дублируется\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "слишком много предпочтений для шифра\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "слишком много предпочтений для хэш-функций\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "слишком много предпочтений для методов сжатия\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "недопустимое вхождение `%s' в строке предпочтений\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "сохраняем самоподпись\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "сохраняем объединяющую подпись\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "неверный размер ключа; используется %u бит\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа приведен к %u битам\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 msgid "Encrypt"
 msgstr ""
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Возможные действия для ключа %s:"
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr "Допустимы действия:"
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Переключить возможность использования для подписи\n"
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Переключить возможность использования для шифрования\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Переключить возможность использования для аутентификации\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Завершено\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Выберите тип ключа:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA и ElGamal (по умолчанию)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (только для подписи)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (с требуемыми возможностями)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (только для шифрования)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (только для подписи)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (с требуемыми возможностями)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Пара ключей DSA будет иметь длину %u бит.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "ключи %s могут иметь длину от %u до %u бит.\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Какой размер ключа Вам необходим? (%u) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "размер ключей %s должен быть в пределах %u-%u\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запрашиваемый размер ключа %u бит\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3898,7 +3903,7 @@ msgstr ""
 "      <n>m = срок действительности n месяцев\n"
 "      <n>y = срок действительности n лет\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3914,38 +3919,38 @@ msgstr ""
 "      <n>m = срок действительности подписи n месяцев\n"
 "      <n>y = срок действительности подписи n лет\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "Ключ действителен до? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпись действительна до? (%s) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "недопустимое значение\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 msgid "Key does not expire at all\n"
 msgstr "Ключ не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 msgid "Signature does not expire at all\n"
 msgstr "Подпись не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ действителен до: %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3953,11 +3958,11 @@ msgstr ""
 "Ваша система не может корректно отображать даты после 2038.\n"
 "Однако, корректно обрабатываются даты до 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 msgid "Is this correct? (y/N) "
 msgstr "Все верно? (y/N) "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3972,44 +3977,44 @@ msgstr ""
 "    \"Baba Yaga (pensioner) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Ваше настоящее имя: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Недопустимый символ в Имени\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "Имя не должно начинаться с цифры\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "Имя не должно быть короче 5 символов\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "Email-адрес: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Неправильный e-mail адрес\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Комментарий: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Недопустимый символ в комментарии\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Используется таблица символов: `%s'.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4020,7 +4025,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Не вставляйте email-адрес в имя пользователя или комментарий\n"
 
@@ -4035,24 +4040,24 @@ msgstr "Не вставляйте email-адрес в имя пользоват�
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Сначала исправьте ошибку\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4060,12 +4065,12 @@ msgstr ""
 "Для защиты секретного ключа необходим пароль.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4077,7 +4082,7 @@ msgstr ""
 "запустив данную программу с ключом \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4089,50 +4094,50 @@ msgstr ""
 "обращения к дискам) в процессе генерации; это даст генератору\n"
 "случайных чисел возможность получить лучшую энтропию.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "сохранение открытого ключа в `%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "сохранение заглушки секретного ключа в `%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и закрытый ключи созданы и подписаны.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4140,712 +4145,712 @@ msgstr ""
 "Учтите, что данный ключ не может использоваться для шифрования.  Вы можете\n"
 "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "ПРЕДУПРЕЖДАЮ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 msgid "Really create? (y/N) "
 msgstr "Действительно создать? (y/N)"
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "сбой сохранения ключа на карту: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "не могу создать резервную копию, файл `%s': %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "ЗАМЕТЬТЕ: архивная копия ключа на карте сохранена в `%s'\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "неогранич "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Критические правила для подписи: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Политика подписи: "
 
 # check it
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Критическое примечание к подписи: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Примечание к подписи"
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Таблица ключей"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 msgid "      Key fingerprint ="
 msgstr "Отпечаток ключа ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "при переименовании `%s' в `%s' произошел сбой: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ВНИМАНИЕ: Существуют 2 файла с конфиденциальной информацией.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s осталось без изменений\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s новых\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Исправьте эту прореху безопасности\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "кеширую связки ключей `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu ключей закешировано за это время (%lu подписей)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu ключей закешированно (%lu подписей)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: таблица ключей создана\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ВНИМАНИЕ: параметр сервера ключей `%s' не используется на данной платформе\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Введите число(а), N) Следующий или Q) Выход> "
 
 # test it
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ключ \"%s\" не найден на сервере ключей\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 msgid "key not found on keyserver\n"
 msgstr "ключ не найден на сервере ключей\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "запрашиваю ключ %s с %s сервера %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "получение ключа %s с %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "поиск \"%s\" на %s сервере %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "поиск \"%s\" на %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "отправляю ключ %s на %s сервер %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "отправка ключа %s на %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "поиск \"%s\" на %s сервере %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "поиск \"%s\" на %s\n"
 
 # test it
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 msgid "no keyserver action!\n"
 msgstr ""
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "ВНИМАНИЕ: обработчик сервера ключей от другой версии GnuPG (%s)\n"
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr "сервер ключей не прислал VERSION\n"
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "не заданы серверы ключей (используйте --keyserver)\n"
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "Данная сборка не поддерживает внешние вызовы для сервера ключей.\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "нет обработчика для схемы сервера ключей `%s'\n"
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "действие `%s' не поддерживается серверами ключей `%s'\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s не поддерживает версию обработчика %d\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 msgid "keyserver timed out\n"
 msgstr "превышено время ожидания сервера ключей\n"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 msgid "keyserver internal error\n"
 msgstr "ошибка сервера ключей\n"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ошибка связи с сервером ключей: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" не идентификатор ключа: пропущен\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "обновление 1 ключа из %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "обновление %d ключей из %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "странный размер зашифрованного сеансового ключа (%d)\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "сеансовый ключ зашифрован %s \n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "пароль создан с незнакомой хеш-фкнкцией %d\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, c-format
 msgid "public key is %s\n"
 msgstr "открытый ключ %s\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "данные зашифрованы открытым ключом: правильный DEK\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "зашифровано %u-битным ключом %s, с ID %s, созданным %s\n"
 
-#: g10/mainproc.c:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключом %s с ID %s\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "сбой расшифрования с открытым ключом: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано с %lu паролями\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано с 1 паролем\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "принятие %s зашифрованных данных\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "шифр IDEA недоступен, попробуйте использовать взамен %s\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "Расшифровано\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ВНИМАНИЕ: целостность сообщения не защищена\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ВНИМАНИЕ: зашифрованное сообщение было изменено!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "сбой расшифрования: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "ЗАМЕТЬТЕ: отправитель требует \"только для просмотра Вами\"\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "оригинальное имя файла='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "самостоятельный сертификат отзыва: \"gpg --import\" для применения\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Действительная подпись от \"%s\""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "проверка подписи подавлена\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не могу обработать эти множественные подписи\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Подпись сделана %s\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпись создана %s ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "Ключ доступен на:"
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХАЯ подпись от  \"%s\""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Просроченная подпись от \"%s\""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Действительная подпись от \"%s\""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[сомнительно]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Подпись просрочена %s\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "двоичный"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "текстовый"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "неизвестно"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Не могу проверить подпись: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "не отделенная подпись\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "ВНИМАНИЕ: обнаружено множество подписей.  Только первая будет проверена.\n"
 
-#: g10/mainproc.c:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "самостоятельная подпись класса 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "старый (PGP 2.x) стиль подписи\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "обнаружен недопустимый корневой пакет в proc_tree()\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "не могу отключить создание файла копии образа памяти: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 "ВНИМАНИЕ: используется экспериментальный алгоритм %s шифрования с открытым "
 "ключом\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 "ВНИМАНИЕ: используется экспериментальный алгоритм симметричного шифрования %"
 "s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "ВНИМАНИЕ: используется экспериментальная хеш-функция %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ВНИМАНИЕ: хеш-функция %s считается устаревшей\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "модуль поддержки шифра IDEA не обнаружен\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "Для дополнительной информации см. http://www.gnupg.org/faq.html\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: не рекомендуемая опция \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "используйте \"%s%s\" взамен\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "ВНИМАНИЕ: команда \"%s\" является устаревшей - не следует применять ее\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "Без сжатия"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "данное сообщение может быть не пригодно для %s\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "двусмысленный параметр `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "неизвестный параметр `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Файл `%s' существует. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 msgid "Overwrite? (y/N) "
 msgstr "Перезаписать (y/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: неизвестное окончание\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Введите новое имя файла"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "Вывод в stdout\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "принятие подписанных данных в `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "создан новый файл настроек `%s'\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "ВНИМАНИЕ: параметры в `%s' еще не активны при этом запуске\n"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "создан каталог `%s'\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "не могу использовать алгоритм с открытым ключом %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ВНИМАНИЕ: потенциально небезопасный сеансовый ключ, зашифрованный "
 "симметричным шифром\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent недоступен в данной сессии\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "протокол gpg-agent версии %d не поддерживается\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "не могу подключиться к `%s': %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "проблема с агентом - использование агента отключено\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (главный ключ ID %s)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4856,48 +4861,48 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бит %s ключ, ID %s, создан %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Повторите пароль\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Введите пароль\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "прервано пользователем\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr "не могу получить пароль в пакетном режиме\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Введите пароль: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr "Необходим пароль для доступа к секретному ключу пользователя: \"%s\"\n"
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бит %s ключ, ID %s, создан %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (подключ на главном ключе %s)"
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Повторите пароль: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4911,118 +4916,118 @@ msgstr ""
 "с Вашим открытым ключом и увеличит его размер, т.е. не следует брать очень\n"
 "большое изображение. Рекомендуемый размер около 240x288.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Введите имя JPEG файла для Фото ID: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "Не могу открыть JPEG файл `%s': %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Этот JPEG очень велик (%d байт)!\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Вы действительно хотите использовать его? (y/N)"
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' - не JPEG файл\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Данное фото правильное (y/N/q)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "не могу отобразить Фото ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "Без указания причины"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "Ключ заменён другим"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "Ключ был скомпрометирован"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "Ключ больше не используется"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "User ID больше не действителен"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "причина отзыва: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "прокомментируйте отзыв: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 msgid "No trust value assigned to:\n"
 msgstr "Не задано значение доверия для:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  aka \"%s\"\n"
 
 # test it
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "Насколько Вы уверены, что данный ключ принадлежит пользователю указанному в "
 "User ID ключа?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Не знаю или не буду отвечать\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Не доверяю\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Абсолютно доверяю\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 msgid "  m = back to the main menu\n"
 msgstr " m = вернуться в главное меню\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  s = skip this key\n"
 msgstr " s = пропустить этот ключ\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  q = quit\n"
 msgstr " q = выход\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5031,22 +5036,22 @@ msgstr ""
 "Минимальный уровень доверия данному ключу: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Ваше решение (?-подробнее)? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr ""
 "Вы действительно хотите установить АБСОЛЮТНОЕ доверие владельцу данного "
 "ключа? (y/N)"
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Сертификаты, приводящие к абсолютно доверяемому ключу:\n"
 
 # test it
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
@@ -5054,7 +5059,7 @@ msgstr ""
 "указанному в User ID ключа\n"
 
 # test it
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
@@ -5062,15 +5067,15 @@ msgstr ""
 "указанному в User ID ключа\n"
 
 # test it
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 msgid "This key probably belongs to the named user\n"
 msgstr "Этот ключ вероятно принадлежит названному владельцу\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Данный ключ принадлежит нам\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5080,106 +5085,106 @@ msgstr ""
 "в User ID ключа.  Если Вы ТОЧНО знаете, что Вы делаете,\n"
 "можете ответить на следующий вопрос утвердительно.\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 msgid "Use this key anyway? (y/N) "
 msgstr "Все равно использовать данный ключ? (y/N)"
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ВНИМАНИЕ: Использование недоверяемого ключа!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "ВНИМАНИЕ: возможно данный ключ отозван (ключ отзыва отсутвтует)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "ВНИМАНИЕ: Данный ключ отозван ключом назначенным отзывающим!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ВНИМАНИЕ: Данный ключ отозван его владельцем!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Это может означать, что подпись поддельная.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ВНИМАНИЕ: Данный подключ был отозван его владельцем!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Замечание: Данный ключ отключен.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Замечание: Данный ключ просрочен!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ВНИМАНИЕ: Данный ключ не заверен доверенной подписью!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Нет указаний на то, что подпись принадлежит владельцу.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ВНИМАНИЕ: НЕТ ДОВЕРИЯ данному ключу!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Возможно, что подпись ПОДДЕЛАНА.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ВНИМАНИЕ: Этот ключ не заверен достаточным количеством доверяемых подписей!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Нет уверенности в том, что подпись принадлежит владельцу.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: пропущено: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: пропущено: открытый ключ уже существует\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Не задан User ID. (можете использовать \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr "Текущие получатели:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5187,168 +5192,168 @@ msgstr ""
 "\n"
 "Введите User ID.  Пустая строка для завершения: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Нет такого User ID.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "Открытый ключ отключен.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "пропущено: открытый ключ уже установлен\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "неизвестный получатель по умолчанию \"%s\"\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: пропущено: открытый ключ отключен\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "нет действительных адресов\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "данные не сохранены; используйте \"--output\" для сохранения\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "ошибка создания `%s': %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Отделенная подпись.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Введите имя файла с данными: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "читаю stdin ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "не подписанные данные\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "не могу открыть подписанные данные `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "анонимный получатель; пробую секретный ключ %s ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Отлично, мы анонимный получатель.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "старое шифрование DEK не поддерживается\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "алгоритм шифрования %d%s неизвестен или отключен\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "ВНИМАНИЕ: алгоритм шифрования %s не найден в списке предпочтений получателя\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "ЗАМЕТЬТЕ: секретный ключ %s просрочен с %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "ЗАМЕТЬТЕ: ключ был отозван"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr ""
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "ключ %s не имеет User ID\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Будет отозван:\n"
 
 # check it
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Это - sensitive ключ отзыва)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Создать сертификат отзыва данного ключа? (y/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "Для вывода использован ASCII формат.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr ""
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Сертификат отзыва создан.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "ключи отзыва для \"%s\" не найдены\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "секретный ключ \"%s\" не найден: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "нет соотвествующего открытого ключа: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "открытый ключ не соотвествует секретному!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Создать сертификат отзыва данного ключа? (y/N)"
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "неизвестный алгоритм защиты\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "ЗАМЕЧАНИЕ: Данный ключ не защищен!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5367,120 +5372,120 @@ msgstr ""
 "носитель будет повреждён, но будьте осторожны: система печати\n"
 "Вашей машины может сохранить данные и сделать их доступными для других!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "Укажите причину отзыва:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "Отмена"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Возможно Вы хотите выбрать здесь %d)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Введите необязательное пояснение; закончите пустой строкой:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Причина отзыва: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(Пояснения отсутствуют)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 msgid "Is this okay? (y/N) "
 msgstr "Все правильно? (y/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "секретная часть ключ не доступна\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "метод защиты %d%s не поддерживается\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "метод защиты %d не поддерживается\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Неверный пароль; попробуйте еще раз"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ВНИМАНИЕ: обнаружен слабый ключ - смените пароль еще раз.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "создание нерекомендуемой 16-битной контрольной суммы для защиты ключа\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "создан слабый ключ - повторение\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "невозможно избежать слабого ключа для симметричного шифра; %d попыток!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "ВНИМАНИЕ: конфликт хэшей подписей в сообщении\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 "ВНИМАНИЕ: подписываемый подключ %s не имеет перекрестной сертификации\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "ВНИМАНИЕ: подписываемый подключ %s имеет недостоверную перекрестную "
 "сертификацию\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "открытый ключ %s на %lu секунд моложе подписи\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "открытый ключ %s на %lu секунд моложе подписи\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5488,7 +5493,7 @@ msgstr ""
 "ключ %s был создан на %lu секунд в будущем (time warp или проблемы с "
 "часами)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5496,49 +5501,33 @@ msgstr ""
 "ключ %s был создан на %lu секунд в будущем (time warp или проблемы с "
 "часами)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "ЗАМЕТЬТЕ: подписавший ключ %s - просрочен %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "принята плохая подпись ключа %s с неизвестным критическим битом\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "ключ %s: нет подключа для подключа отзывающей подписи\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "ключ %s: нет подключа для подписи связи подключей\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "невозможно добавить примечение в v3 (PGP 2.x стиля) подпись\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "невозможно добавить примечание в v3 (PGP 2.x стиля) подпись ключа\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "ВНИМАНИЕ: не могу развернуть %% запись (длинный). Использую неразвернутым.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "невозможно добавить URL правил в v3 (PGP 2.x стиля) подпись\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "нельзя ставить URL правил в v3 (PGP 2.x стиля) подписи\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5546,7 +5535,7 @@ msgstr ""
 "ВНИМАНИЕ: не могу развернуть %% url правил (длинный). Использую "
 "неразвернутым.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5555,21 +5544,21 @@ msgstr ""
 "ВНИМАНИЕ: невозможно развернуть %% URL предпочитаемого сервера ключей "
 "(слишком длинно). Использую неразвернутым.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "сбой проверки созданной подписи: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s подпись от: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "только отделенная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5577,49 +5566,49 @@ msgstr ""
 "ВНИМАНИЕ: использование хэш-функции %s (%d) нарушает предпочтения "
 "получателя\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "подпись:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "только прозрачная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "будет использовано %s шифрование\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "ключ не помечен как ненадежный - не могу использовать его с ненадёжным RNG!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "пропущено \"%s\": дубликат\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "пропущено \"%s\": %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "пропущено: секретный ключ уже имеется\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "это созданный PGP ElGamal ключ, не обеспечивающий безопасность подписи!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "запись о доверии %lu, тип %d: ошибка записи: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5628,334 +5617,334 @@ msgstr ""
 "# Список присвоенных значений доверия создан %s\n"
 "# (Используйте \"gpg --import-ownertrust\" для их восстановления)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "ошибка в `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "строка слишком длинная"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "пропущено двоеточие"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "неверный отпечаток"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "пропущено значение степени доверия владельцу"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "ошибка при поиске записи о доверии в `%s': %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "ошибка чтения в `%s': %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "trustdb транзакция слишком длинная\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "нет доступа к `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: каталог не существует!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "невозможно создать блокировку для `%s'\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "невозможно заблокировать `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: сбой создания записи о версии: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: создана недействительная таблица доверий\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: создана таблица доверий\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "ЗАМЕТЬТЕ: таблица доверий доступна только для чтения\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: недействительная таблица доверий\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: сбой создания таблицы хэшей: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: ошибка обновления записи о версии: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: ошибка чтения записи о версии: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: ошибка сохранения записи о версии: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: не является файлом таблицы доверий\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: запись о версии с номером записи %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: неправильная версия файла %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: ошибка чтения свободной записи: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ошибка внесения записи каталога: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: сбой обнуления записи: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: сбой добавления записи: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "таблица доверий повреждена; запустите \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "не могу обработать строки текста длиннее %d символов\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "строка ввода длиннее %d символов\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' не является допустимым длинным ID ключа\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "ключ %s: принят как доверяемый ключ\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "ключ %s встречается более одного раза в таблице доверий\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "ключ %s: нет открытого ключа для доверяемого ключа - пропущен\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "ключ %s помечен как абсолютно доверяемый.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "запись о доверии %lu, тип запроса %d: сбой чтения: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "запись о доверии %lu не запрашиваемого типа %d\n"
 
 # check it
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "не могу использовать неизвестную модель (%d) - использую %s модель доверий\n"
 
 # check it
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "использую %s модель доверий\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[ отозван]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[просрочн]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[неизвстн]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[неопредл]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[ограничн]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[ полное ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[абсолютн]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "неопределено"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "никогда"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "ограниченно"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "полное"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "абсолютное"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "нет необходимости в проверке таблицы доверий\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "срок следующей проверки таблицы доверий %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "нет необходимости проверять таблицу доверий при `%s' модели доверий\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "нет необходимости обновлять таблицу доверий при '%s' модели доверий\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "открытый ключ %s не найден: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "выполните --check-trustdb, пожалуйста\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "проверка таблицы доверий\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ключей обработано (%d дейсвующих записей очищено)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "не найдено абсолютно доверяемых ключей\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "открытый ключ для абсолютно доверяемого ключа %s не найден\n"
 
 # check it
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d ограниченных необходимо, %d выполненных необходимо, %s модель доверия\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5963,13 +5952,13 @@ msgstr ""
 "глубина: %d  корректных: %3d  подписанных: %3d  доверия: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "невозможно обновить запись о версии таблицы доверий: ошибка записи: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5984,308 +5973,320 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "входная строка %u слишком длинная или пропущен LF\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "глобальная ошибка"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "неизвестный тип пакета"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "неизвестная версия"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "неизвестный алгоритм с открытым ключом"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "неизвестная хэш-функция"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "неправильный открытый ключ"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "неправильный секретный ключ"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "подпись неверна"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "несоответствие контрольной сумме"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "неправильный пароль"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "открытый ключ не найден"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "неизвестный алгоритм шифрования"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "не могу открыть таблицу ключей"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "неправильный пакет"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "неправильный ASCII формат"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "нет такого User ID"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "секретный ключ не найден"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "использован неправильный секретный ключ"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "не поддерживается"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "неправильный ключ"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "ошибка чтения файла"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "ошибка записи файла"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "неизвестный алгоритм сжатия"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "ошибка открытия файла"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "ошибка создания файла"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "неправильный пароль"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "нереализованный алгоритм с открытым ключом"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "нереализованный алгоритм шифрования"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "неизвестный класс подписи"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "ошибка в таблице доверий"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "неверный MPI"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "нехватка ресурсов"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "неправильная связка ключей"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "неправильный сертификат"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "деформированный User ID"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "ошибка закрытия файла"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "ошибка переименования файла"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "ошибка удаления файла"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "неожидавшиеся данные"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "конфликт с меткой времени"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "неприменимый алгоритм открытого ключа"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "файл существует"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "слабый ключ"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "недопустимый аргумент"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "плохой URI"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "неподдерживаемый URI"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "ошибка сети"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "не зашифровано"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "не выполнено"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "непригодный открытый ключ"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "непригодный закрытый ключ"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "ошибка сервера ключей"
 
-#: util/errors.c:109
+#: util/errors.c:107
 msgid "canceled"
 msgstr "отменено"
 
-#: util/errors.c:110
+#: util/errors.c:108
 msgid "no card"
 msgstr "нет карты"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "не подписанные данные\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr "ОШИБКА:"
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr "ВНИМАНИЕ:"
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr " ... это ошибка (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Вы нашли ошибку ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "да"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "нет"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 msgid "cC"
 msgstr ""
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "ВНИМАНИЕ: используется незащищенная память!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "Для дополнительной информации см. http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "операция невозможна без инициализации защищенной памяти\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 "(возможно, Вы используете неподходящее программное обеспечение\n"
 "для данной задачи)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "невозможно добавить примечение в v3 (PGP 2.x стиля) подпись\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr "невозможно добавить примечание в v3 (PGP 2.x стиля) подпись ключа\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "невозможно добавить URL правил в v3 (PGP 2.x стиля) подпись\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr "нельзя ставить URL правил в v3 (PGP 2.x стиля) подписи\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA требует использования 160 битной хэш-функции\n"
 
diff --git a/po/sk.po b/po/sk.po
index a8a30afd7..f79601e83 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -13,90 +13,90 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "nem��em vytvori� prvo��slo s d�kou menej ako %d bitov\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "nem��em vytvori� prvo��slo s d�kou menej ako %d bitov\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "nebol detekovan� �iadny modul na z�skanie entropie\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "nemo�no otvori� `%s'\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nem��em pou�i� pr�kaz stat na `%s': %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nie je norm�lny s�bor - ignorovan�\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "pozn�mka: s�bor random_seed je pr�zdny\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "varovanie: neplatn� ve�kos� random_seed - s�bor nepou�it�\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nem��em ��ta� `%s': %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: s�bor random_seed nie je aktualizovan�\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nem��em zapisova� do `%s': %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROVANIE: pou�it� gener�tor n�hodn�ch ��sel nie je bezpe�n�!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -110,7 +110,7 @@ msgstr ""
 "NEPOU��VAJTE �IADNE D�TA VYTVOREN� T�MTO PROGRAMOM!!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -119,7 +119,7 @@ msgstr ""
 "Pros�m �akajte, z�skava sa entropia. Robte zatia� nejak� in� pr�cu\n"
 "aby ste sa nenudili a zv��ite t�m kvalitu entropie.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -130,62 +130,62 @@ msgstr ""
 "Nedostatok n�hodn�ch bajtov. Pros�m, pracujte s opera�n�m syst�mom, aby\n"
 "ste mu umo�nili z�ska� viac entropie (je potrebn�ch %d bajtov).\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -193,364 +193,369 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 #, fuzzy
 msgid "generating new key\n"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII k�dovanie: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "neplatn� hlavi�ka ASCII k�dovania: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "ASCII hlavi�ka: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "neplatn� hlavi�ka podpisu v �itate�nom form�te\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "ASCII hlavi�ka: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "vnoren� podpisy v �itate�nom form�tu\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "neo�ak�van� k�dovanie ASCII:"
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "nespr�vne ozna�enie riadku m�nusmi: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "pred�asn� koniec s�boru (�iadne CRC)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "pred�asn� koniec s�boru (v CRC)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "nespr�vny form�t CRC\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "pred�asn� koniec s�boru (v p�ti�ke)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "chyba v p�ti�ke\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatn� k�dovanie ASCII: riadok je dlh�� ako %d znakov\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "neplatn� znak (quoted-printable) v ASCII k�dovan� - pravdepodobne bol "
 "pou�it� nespr�vny MTA\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tajn� k��� nie je dostupn�"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "V� v�ber? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 #, fuzzy
 msgid "unspecified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 #, fuzzy
 msgid "not forced"
 msgstr "nespracovan�"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizova� predvo�by"
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -558,295 +563,295 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 #, fuzzy
 msgid "list all available data"
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeni� dobu platnosti"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Pr�kaz> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "tajn� k��� nie je dostupn�"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Opakujte heslo: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(pokia� neur��te k��� jeho fingerprintom)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 #, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "bez parametra \"--yes\" to nemo�no v d�vkovom m�de previes�\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 #, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Zmaza� tento k��� zo s�boru k���ov? "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 #, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Toto je tajn� k���! - skuto�ne zmaza�? "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "inform�cie o d�veryhodnosti vlastn�ka k���a vymazan�\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby ste ho zmazali, pou�ite najprv prep�na� \"--delete-secret-key\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "v m�de S2K nemo�no pou�i� symetrick� ESK paket\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "pou�it� �ifra %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROVANIE: s�bor `%s' je pr�zdny\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete �ifrova� len RSA k���om s d�kou 2048 bitov a menej\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "��tam z `%s'\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "algoritmus IDEA nemo�no pou�i� na v�etky k���e, pre ktor� �ifrujete.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -854,172 +859,172 @@ msgid ""
 msgstr ""
 "vy�iadan� kompresn� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pre: %s\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� d�ta\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VAROVANIE: spr�va bola za�ifrovan� slab�m k���om v symetrickej �ifre.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "probl�m so za�ifrovan�m paketom\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "�iadne vzialen� vykon�vanie programu nie je podporovan�\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "volanie extern�ho programu zru�en� kv�li nebezpe�n�m pr�vam s�boru "
 "nastaven�\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 #, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "t�to platforma potrebuje do�asn� s�bory na spustenie extern�ho programu\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, fuzzy, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "nemo�no spusti� %s \"%s\": %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, fuzzy, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nemo�no spusti� %s \"%s\": %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "syst�mov� chyba pri volan� extern�ho programu: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "nekorektn� ukon�enie extern�ho programu\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "nemo�no spusti� extern� program\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "nemo�no c�ta� odozvu extern�ho programu: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� adres�r `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "�iadne revoka�n� k���e pre `%s' nen�jden�\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revokova� sekund�rny k���"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "nepou�ite�n� tajn� k���"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "k��� %08lX: nie je chr�nen� - presko�en�\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "k��� %08lX: PGP 2.x k��� - presko�en�\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VAROVANIE: tajn� k��� %08lX nem� jednoduch� SK kontroln� s��et\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1027,128 +1032,128 @@ msgstr ""
 "@Pr�kazy:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[s�bor]|vytvori� podpis"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "vyp�sa� zoznam k���ov a podpisov"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "podp�sa� k���"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "podp�sa� alebo modifikova� k���"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "aktualizova� v�etky k���e zo servera k���ov"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "importova�/zl��i� k���e"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "aktualizova� datab�zu d�very"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [s�bory]|vyp�� hash"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1158,55 +1163,55 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou�i� toto id u��vate�a na podp�sanie\n"
 " alebo de�ifrovanie"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
 " komprim�cia)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "pou�i� ako v�stupn� s�bor"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "vy�iada� potvrdenie pred prep�san�m"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1215,7 +1220,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1235,17 +1240,17 @@ msgstr ""
 " --list-keys [men�]        vyp�sa� k���e\n"
 " --fingerprint [men�]      vyp�sa� fingerprinty\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
 "Pripomienky k prekladu <[email protected]>.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1255,7 +1260,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1263,653 +1268,653 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "�ifry: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra \"%s\" nebola nahran�, preto�e pr�stupov� pr�va nie s� nastaven� "
 "bezpe�ne\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� len oddelen� podpisy alebo podpisy �itate�n� "
 "ako text\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�de --pgp2 nemo�no s��asne �ifrova� a podpisova�\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrovanie spr�v v m�de --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatn� implicitn� �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "neplatn� minim�lna �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� �ifrovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� hashovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� kompresn� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVANIE: dan� adres�t (-r) bez pou�itia �ifrovania s verejn�m k���om\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u��vate�a] [s�bor s k���mi (keyring)]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pr�li� ve�a polo�iek v bufferi verejn�ch k���ov - vypnut�\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id not found]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
 # c-format
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Neplatn� k��� %08lX zmenen� na platn� pomocou --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� %08lX!\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "by� o trochu tich��"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "Zmaza� tento k��� zo s�boru k���ov? "
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "konflikt �asov�ho raz�tka"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pou�itie: gpgv [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1917,7 +1922,7 @@ msgstr ""
 "Syntax: gpg [nastavenia] [s�bory]\n"
 "Skontroluje podpisy oproti zn�mym d�veryhodn�m k���om\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1928,7 +1933,7 @@ msgstr ""
 "d�very\"; nem� to ni� spolo�n� s (implicitne vytvorenou) \"pavu�inou\n"
 "certifik�tov\"."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1940,17 +1945,17 @@ msgstr ""
 "k tajn�m k���om. Odpovedzte \"ano\", aby ste nastavili tieto k���e\n"
 "ako absol�tne d�veryhodn�\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Pokia� aj tak chcete pou�i� tento ned�veryhodn� k���, odpovedzte \"ano\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Vlo�te identifik�tor adres�ta, ktor�mu chcete posla� spr�vu."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1964,7 +1969,7 @@ msgid ""
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1975,16 +1980,16 @@ msgstr ""
 "Tento algoritmus je vhodn� pou�i� len za ur�it�ch podmienok.\n"
 "Kontaktujte pros�m najprv bezpe�nostn�ho �pecialistu."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Vlo�te d�ku k���a"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Odpovedzte \"ano\" alebo \"nie\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1996,19 +2001,19 @@ msgstr ""
 "spr�vnu chybov� hl�ku - miesto toho syst�m sk�si interpretova�\n"
 "zadan� hodnotu ako interval."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Vlo�te meno dr�ite�a k���a"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "pros�m, vlo�te e-mailov� adresu (nepovinn�, ale ve�mi odpor��an�)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Pros�m, vlo�te nepovinn� koment�r"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2022,11 +2027,11 @@ msgstr ""
 "O  pre pokra�ovanie generovania k���a.\n"
 "Q  pre ukon�enie generovania k���a."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Ak chcete generova� podk���, odpovedzte \"ano\" (alebo len \"a\")."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2100,13 +2105,13 @@ msgstr ""
 "\n"
 "Pokia� neviete, ak� je spr�vna odpove�, odpovedzte \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 #, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 "Pokia� chcete podp�sa� V�ETKY identifik�tory u��vate�ov, odpovedzte \"ano\""
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2115,11 +2120,11 @@ msgstr ""
 "\".\n"
 "V�etky certifik�ty bud� tie� straten�!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Odpovedzte \"ano\", pokia� chcete zmaza� podk���"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2129,7 +2134,7 @@ msgstr ""
 "preto�e m��e by� d�le�it� pri vytv�ran� d�very k���a alebo in�ho k���a\n"
 "ceritifikovan�ho t�mto k���om."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2141,13 +2146,13 @@ msgstr ""
 "bol pou�it�, preto�e tento podpisovac� k��� m��e vytvori� d�veru\n"
 "prostredn�ctvom in�ho u� certifikovan�ho k���a."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "Podpis je neplatn�. Je rozumn� ho odstr�ni� z V�ho s�boru k���ov."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2160,7 +2165,7 @@ msgstr ""
 "pou��va�. Urobte to len v pr�pade, ke� je tento podpis k���a\n"
 "n�m sam�m z nejak�ho d�vodu neplatn� a ke� je k dispoz�cii in� k���."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2170,24 +2175,24 @@ msgstr ""
 "na aktu�lny zoznam predvolieb. �asov� raz�tka v�etk�ch dotknut�ch podpisov\n"
 "k���ov nimi samotn�mi bud� posunut� o jednu sekundu dopredu.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Pros�m, zopakujte posledn� heslo, aby ste si boli ist�, �o ste nap�sali."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Zadajte n�zov s�boru, ku ktor�mu sa podpis vz�ahuje"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Ak si prajete prep�sanie s�boru, odpovedzte \"ano\""
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2195,7 +2200,7 @@ msgstr ""
 "Pros�m, vlo�te nov� n�zov s�boru. Ak len stla��te RETURN, bude\n"
 "pou�it� implicitn� s�bor (ktor� je zobrazen� v z�tvork�ch)."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2223,7 +2228,7 @@ msgstr ""
 "      Toto pou�ite, pokia� by sa identifik�tor u��vate�a u� nemal pou��va�;\n"
 "      norm�lne sa pou��va na ozna�enie neplatnej e-mailov� adresy.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2233,541 +2238,541 @@ msgstr ""
 "ceritifik�tu. Pros�m, stru�ne. \n"
 "Text kon�� pr�zdnym riadkom.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Pomoc nie je k dispoz�cii"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pomoc nie je dostupn� pre '%s'"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "aktualizova� datab�zu d�very"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "nepou�ite�n� tajn� k���"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d bol presko�en�\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu k���e boli doteraz spracovan�\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkovo spracovan�ch k���ov: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      presko�en� nov� k���e: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        bez identifik�torov: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "                importovan�: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  bez zmien: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nov� id u��vate�ov: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              nov� podk���e: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "               nov� podpisy: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      nov� revok�cie k���ov: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      pre��tan� tajn� k���e: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    importovan� tajn� k���e: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      tajn� k���e nezmenen�: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "           neimportovan�: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "               nov� podpisy: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      pre��tan� tajn� k���e: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "k��� %08lX: HKP po�kodenie podk���a opraven�\n"
 
 # c-format
-#: g10/import.c:765
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: prijat� id u��vate�a '%s', ktor� nie je podp�san� n�m sam�m\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "k��� %08lX: ch�ba platn� identifik�tor u��vate�a\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "m��e to by� sp�soben� ch�baj�cim podpisom k���a n�m sam�m\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em n�js� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em ��ta� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� identifik�tor u��vate�a\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "k��� %08lX: \"%s\" bez zmeny\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a %d - presko�en�\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nie je nastaven� implicitn� s�bor tajn�ch k���ov %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "k��� %08lX: tajn� k��� importovan�\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "k��� %08lX: je u� v s�bore tajn�ch k���ov\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "k��� %08lX: nebol n�jden� tajn� k���: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "k��� %08lX: ch�ba verejn� k��� - nem��em aplikova� revoka�n� certifik�t\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - zamietnut�\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "k��� %08lX: neexistuje id u��vate�a pre podpis\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a u u��vate�sk�ho id \"%s"
 "\"\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: neplatn� podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "k��� %08lX: neexistuje podk��� pre viazanie k���ov\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� v�zba podk���a\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "k��� %08lX: neexistuje podk��� na revok�ciu k���a\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� revok�cia podk���a\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "k��� %08lX: podk��� presko�en�\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "k��� %08lX: podpis nie je exportovate�n� (trieda %02x) - presko�en�\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "k��� %08lX: revoka�n� certifik�t na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - presko�en�\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "k��� %08lX: zisten� duplikovan� identifik�tor u��vate�a - zl��en�\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: sk��am z�ska� revoka�n� k��� %"
 "08lX\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: revoka�n� k��� %08lX nen�jden�.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "s�bor k���ov (keyring) `%s' vytvoren�\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revok�cia]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[podpis k���a n�m sam�m]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 zl� podpis\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d zl�ch podpisov\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neoveren�, preto�e ch�ba k���\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpisov neoveren�ch, preto�e ch�ba k���\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neoveren�, preto�e vznikla chyba\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpisov neoveren�ch, preto�e vznikli chyby\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "zisten� 1 identifik�tor u��vate�a bez platn�ho podpisu n�m sam�m\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "zisten�ch %d identifik�torov u��vate�a bez platn�ho podpisu n�m sam�m\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2780,63 +2785,63 @@ msgstr ""
 "kontrolou fingerprintov z r�znych zdrojov...)?\n"
 "\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�verujem �iasto�ne\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�verujem �plne\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  Nemo�no podp�sa�.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2845,11 +2850,11 @@ msgstr ""
 "Podpis k���a \"%s\" n�m sam�m je\n"
 "podpis vo form�te PGP 2.x.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Prajete si ho zmeni� na form�t OpenPGP? (a/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2859,11 +2864,11 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2873,54 +2878,54 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Prajete si ho zmeni� na plne exportovate�n� podpis? (a/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" je u� lok�lne podp�san� k���om %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je u� podp�san� k���om %08lX\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Ni� na podp�sanie k���om %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Platnos� k���a vypr�ala!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnos� k���a vypr�� %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nem��ete vytvori� OpenPGP podpis k���a typu PGP 2.x, ke� ste v --pgp2 m�de.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by sp�sobilo nepou�itelnos� k���a v PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2930,32 +2935,32 @@ msgstr ""
 "patr� vy��ie uvedenej osobe?\n"
 "Pokia� nepozn�te odpove�, zadajte \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpoviem.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) V�bec som to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) �iasto�ne som to overil(a).%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ve�mi d�kladne som to overil(a).%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "V� v�ber? ('?' - viac inform�ci�): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2964,28 +2969,28 @@ msgstr ""
 "Ste si ist�, �e chcete podp�sa� tento k���\n"
 "svoj�m k���om: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ide o podpis k���a n�m sam�m\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "VAROVANIE: podpis nebude ozna�en� ako neexportovate�n�.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "VAROVANIE: podpis nebude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
@@ -2993,72 +2998,72 @@ msgstr ""
 "Podpis bude ozna�en� ako neexportovate�n�.\n"
 "\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "V�bec som tento k��� neoveril.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "�iasto�ne som overil tento k���.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Velmi d�kladne som overil tento k���.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Tento k��� nie je chr�nen�.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "k��� je chr�nen�.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nie je mo�n� editova� tento k���: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3066,11 +3071,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3078,206 +3083,206 @@ msgstr ""
 "Nechcete heslo - to je *zl�* n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Skuto�ne to chcete urobi�? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "pres�vam podpis k���a na spr�vne miesto\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "ulo�i� a ukon�i�"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revokova� podpisy"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "prida� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "prida� fotografick� ID"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "zmaza� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "zmaza� sekund�rny k���"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "prida� revoka�n� k���"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prepn�� medzi vyp�san�m zoznamu tajn�ch a verejn�ch k���ov"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "vyp�sa� zoznam predvolieb (podrobne)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "zmeni� heslo"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revokova� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revokova� sekund�rny k���"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 #, fuzzy
 msgid "enable key"
 msgstr "nastavi� k��� ako platn� (enable)"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "disable key"
 msgstr "nastavi� k��� ako neplatn� (disable)"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "uk�za� fotografick� ID"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "chyba pri ��tan� bloku tajn�ho k���a `%s': %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Tajn� k��� je dostupn�.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Na vykonanie tejto oper�cie je potrebn� tajn� k���.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, najsk�r pou�ite pr�kaz \"toggle\" (prepn��).\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3285,241 +3290,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "K��� revokovan�."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nezn�ma trieda podpisu"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete zmaza� posledn� id u��vate�a!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Skuto�ne odstr�ni� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Skuto�ne chcete zmaza� tento k���? "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Skuto�ne revokova� toto id u��vate�a? "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Skuto�ne chcete revokova� vybran� k���e? "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "nastavi� zoznam predvolieb"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by? "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ulo�i� zmeny? "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�i� bez ulo�enia? "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr "Not�cie: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "U��vate�sk� ID vo form�te PGP 2.x nem� �iadne predvo�by\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citliv� inform�cia)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3527,19 +3532,19 @@ msgstr ""
 "Pros�m nezab�dajte, �e zobrazovan� �daje o platnosti k���ov nemusia\n"
 "by� spr�vne, pokia� znovu nespust�te program.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3547,7 +3552,7 @@ msgstr ""
 "VAROVANIE: �iadne ID u��vate�a nebolo ozna�en� ako prim�rne. Tento pr�kaz\n"
 "sp�sob�, �e in� ID u��vate�a sa bude pova�ova� prim�rne.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3556,75 +3561,75 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohto k���a.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le prida�? (a/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazan� %d podpis.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazan�ch %d podpisov.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "neplatn� sp�sob reprezent�cie v ASCII"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3633,370 +3638,370 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohoto k���a.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "k��� vo form�te PGP 2.x nemo�no poveri� revok�ciou\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "k��� nemo�no poveri� revok�ciou n�m sam�m\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROVANIE: ozna�enie k���a ako revokovac� u� nem��e by� zru�en�!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Ste si ist�, �e chcete ozna�i� tento k��� ako revokovac�? (a/N): "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Pros�m, odstr��te v�ber z tajn�ch k���ov.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROVANIE: podpisovac� podk��� %08lX nie je kr��ovo certifikovan�\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "presko�en� v3 podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podpisov� not�cia: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Prep�sa� (a/N)? "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   podp�san� %08lX v %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le revokova�? (a/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROVANIE: podpis pou�ivate�k�ho ID vznikol %d sekund v bud�cnosti\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Zobrazujem %s fotografick� ID s ve�kos�ou %ld pre k��� 0x%08lX (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "duplicita predvo�by %c%lu\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 #, fuzzy
 msgid "too many cipher preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 #, fuzzy
 msgid "too many digest preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 #, fuzzy
 msgid "too many compression preferences\n"
 msgstr "pr�li� ve�a `%c' predvolieb\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "zapisujem podpis k���a n�m sam�m (direct signature)\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "zapisujem podpis k���a sebou sam�m\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "zapisujem \"key-binding\" podpis\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�ka k���a; pou�ijem %u bitov\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 #, fuzzy
 msgid "Encrypt"
 msgstr "�ifrova� d�ta"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (len na podpis)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (len na podpis)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "P�r k���ov DSA bude ma� d�ku 1024 bitov.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ak� ve�kos� k���a si prajete? (1024) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�ka k���a je %u bitov.\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4012,7 +4017,7 @@ msgstr ""
 "      <n>m = doba platnosti k���a skon�� za n mesiacov\n"
 "      <n>y = doba platnosti k���a skon�� za n rokov\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4028,40 +4033,40 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�� za n mesiacov\n"
 "      <n>y = doba platnosti podpisu skon�� za n rokov\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "K��� je platn� na? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� na? (0) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "platnos� %s skon�� %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4069,12 +4074,12 @@ msgstr ""
 "V� syst�m nevie zobrazi� d�tumy po roku 2038.\n"
 "V ka�dom pr�pade bud� d�tumy korektne spracov�van� do roku 2106.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vne (a/n)? "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 #, fuzzy
 msgid ""
 "\n"
@@ -4091,44 +4096,44 @@ msgstr ""
 "    \"Jozko Mrkvicka (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Meno a priezvisko: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve mene\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "Meno nem��e za��na� ��slicou\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Koment�r: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment�ri\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��vate znakov� sadu `%s'.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4139,7 +4144,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do po�a meno alebo koment�r nep��te, pros�m, e-mailov� adresu.\n"
 
@@ -4154,23 +4159,23 @@ msgstr "Do po�a meno alebo koment�r nep��te, pros�m, e-mailov� adresu.\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (U)kon�i�? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (P)okra�ova�/(U)kon�i�? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Najsk�r, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4178,12 +4183,12 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4195,7 +4200,7 @@ msgstr ""
 "tohto programu s parametrom \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4207,50 +4212,50 @@ msgstr ""
 "pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Vytv�ranie k���a bolo zru�en�.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisujem verejn� k��� do `%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor verejn�ch k���ov (pubring): %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor tajn�ch k���ov (secring): %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "chyba pri z�pise do s�boru verejn�ch k���ov `%s': %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4259,12 +4264,12 @@ msgstr ""
 "Tento k��� nem��e by� pou�it� na �ifrovanie. Pre vytvorenie\n"
 "sekund�rneho k���a na tento ��el m��ete pou�i� pr�kaz \"--edit-key\".\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4272,7 +4277,7 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4280,700 +4285,700 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZN�MKA: vytvorenie podk���a pre k���e v3 nie je v s�lade s OpenPGP\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvori�? "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "nikdy     "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Kritick� podpisov� politika: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Podpisov� politika: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Kritick� podpisov� not�cia: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Podpisov� not�cia: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "s�bor k���ov (keyring)"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podk���a:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr " Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podk���a:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "   Fingerprint k���a ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROVANIE: Existuj� dva s�bory s tajn�mi inform�ciami.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s je bez zmeny\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s je nov�\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Pros�m, opravte tento mo�n� bezpe�nostn� probl�m\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrolujem s�bor k���ov (keyring) `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podp�san� Va��m k���om %08lX v %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, 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:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s k��� �ifrovan�ho sedenia\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "verejn� k��� je %08lX\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "d�ta za�ifrovan� verejn�m k���om: spr�vny DEK\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, 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:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrovan� %s k���om, ID %08lX\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrovanie verejn�m k���om zlyhalo: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrovan� s %lu heslami\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrovan� jedn�m heslom\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "predpoklad�m %s �ifrovan�ch d�t\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "de�ifrovanie o.k.\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROVANIE: spr�va nem� ochranu integrity\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVANIE: so za�ifrovanou spr�vou bolo manipulovan�!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odosielate� po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� meno s�boru='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 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:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "verifik�cia podpisu potla�en�\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, 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:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ZL� podpis od \""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�anou platnos�ou od \""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[neist�]  "
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "bin�rne"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "textov� m�d"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "nezn�me"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem��em overi� podpis: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelen� od dokumentu\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 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:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "n�jden� neplatn� kore�ov� paket v proc_tree()\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nem��em vypn�� vytv�ranie core s�borov: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "�ifrovac� algoritmus nie je implementovan�"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pre GnuPG nen�jden�\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = pros�m o viac inform�c�i\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ite namiesto neho \"%s%s\" \n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "t�to spr�va nemus� pou�ite�n� s %s\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "S�bor `%s' existuje. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 #, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Prep�sa� (a/N)? "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nezn�ma pr�pona\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Vlo�te nov� n�zov s�boru"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "zapisujem na �tandardn� v�stup (stdout)\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "predpoklad�m podp�san� d�ta v `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "vytvoren� nov� konfigura�n� s�bor `%s'\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, 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"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: adres�r vytvoren�\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "VAROVANIE: pravdepodobne nebezpe�n� symetricky �ifrovan� k��� sedenia\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentom - pou��vanie agenta vypnut�\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hlavn� ID k���a %08lX)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4984,28 +4989,28 @@ msgstr ""
 "\"%.*s\"\n"
 "k��� s d�kou %u bitov, typ %s, ID %08lX, vytvoren� %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Opakova� heslo\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Vlo�i� heslo\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "v d�vkovom re�ime sa nem��em p�ta� na heslo\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Vlo�te heslo: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5015,21 +5020,21 @@ msgstr ""
 "Mus�te pozna� heslo, aby ste odomkli tajn� k��� pre\n"
 "u��vate�a: \""
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ka %u bitov, typ %s, ID %08lX, vytvoren� %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5044,164 +5049,164 @@ msgstr ""
 "Ak pou�ijete ve�mi ve�k� obr�zok, k��� bude tie� ve�k�! Odpor��an� ve�kos�\n"
 "obr�zka je okolo 240x288.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Meno s�bor s fotografiou vo form�te JPEG: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, fuzzy, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, fuzzy, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" nie je s�bor JPEG\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Je t�to fotografia spr�vna (a/N/u)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "K��� je nahraden�"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "K��� bol skompromitovan�"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "K��� sa u� nepou��va"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "Identifik�tor u��vate�a u� neplat�"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "d�vod na revok�ciu: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "revoka�n� pozn�mka: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMuUsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 #, fuzzy
 msgid "No trust value assigned to:\n"
 msgstr ""
 "Nie je priraden� �iadna hodnota d�very k:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, fuzzy, c-format
 msgid "  aka \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 #, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "Tento k��� pravdepodobne patr� jeho majite�ovi\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, fuzzy, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = Neviem\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Ned�verujem\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, fuzzy, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = D�verujem absol�tne\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 #, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = sp� do hlavn�ho menu\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 #, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = presko�i� tento k���\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 #, fuzzy
 msgid "  q = quit\n"
 msgstr " u = ukon�i�\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Va�e rozhodnutie? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Skuto�ne chcete nastavi� pre tento k��� absol�tnu d�veru? "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifik�ty ved�ce k fin�lnemu d�veryhodn�mu k���u:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 #, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "Tento k��� pravdepodobne patr� jeho majite�ovi\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Tento k��� patr� n�m (m�me zodpovedaj�ci tajn� k���)\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5213,111 +5218,111 @@ msgstr ""
 "odpoveda� �no\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Pou�i� napriek tomu tento k���? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROVANIE: Je pou�it� ned�veryhodn� k���!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VAROVANIE: k��� m��e by� revokovan� (revoka�n� k��� neexistuje)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho vlastn�kom!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         To m��e znamena�, �e podpis je falo�n�.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROVANIE: Tento podk��� bol revokovan� jeho vlastn�kom!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Pozn�mka: Tento k��� bol ozna�en� ako neplatn� (disabled).\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Pozn�mka: Skon�ila platnos� tohto k���a!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VAROVANIE: Tento k��� nie certifikovan� d�veryhodn�m podpisom!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROVANIE: NEd�verujeme tomuto k���u!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Tento podpis je pravdepodobne FALO�N�.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROVANIE: Tento k��� nie je certifikovan� dostato�ne d�veryhodn�mi "
 "podpismi!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nie je ist�, �e tento podpis patr� vlastn�kovi.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: presko�en�: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: presko�en�: verejn� k��� je u� obsiahnut� v datab�ze\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Ne�pecifikovali ste identifik�tor u��vate�a (user ID). M��ete pou�i� \"-r\"\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5325,168 +5330,168 @@ msgstr ""
 "\n"
 "Nap��te identifik�tor u��vate�a (user ID). Ukon�ite pr�zdnym riadkom: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Tak�to identifik�tor u��vate�a neexistuje.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "presko�en�: verejn� k��� je u� nastaven� pod�a implicitn�ho adres�ta\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "Verejn� k��� je neplatn� (disabled).\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "presko�en�: verejn� k��� je u� nastaven�\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: presko�en�: verejn� k��� je neplatn� (disabled)\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "�iadne platn� adresy\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "d�ta neboli ulo�en�; na ich ulo�enie pou�ite prep�na� \"--output\"\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Podpis oddelen� od dokumentu.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zov d�tov�ho s�boru: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "��tam �tandardn� vstup (stdin) ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "ch�baj� podp�san� d�ta\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nem��em otvori� podp�san� d�ta '%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonymn� adres�t; sk��am tajn� k��� %08lX ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "o.k., my sme anonymn� adres�t.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "star� k�dovanie DEK nie je podporov�n�\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifrovac� algoritmus %d%s je neznam� alebo je zak�zan�\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "POZN�MKA: v predvo�b�ch nen�jden� �ifrovac� algoritmus %d\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: k��� bol revokovan�"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet zlyhala: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, fuzzy, c-format
 msgid "key %s has no user IDs\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Bude revokovan�:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Toto je citliv� revoka�n� k���)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "Vyn�ten� ASCII textov� v�stup.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet zlyhala: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "�iadne revoka�n� k���e pre `%s' nen�jden�\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "POZN�MKA: Tento k��� nie je chr�nen�!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5504,120 +5509,120 @@ msgstr ""
 "Ale hroz� nebezpe�enstvo: Tla�ov� syst�m V�ho po��ta�a m��e uklada� d�ta a\n"
 "spr�stupni� ich in�m!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "Zru�i�"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravdepodobne ste chceli vybra� %d)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Ak chcete, nap��te popis; ukon�ite pr�zdnym riadkom:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "D�vod na revok�ciu: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(�iadny popis)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Je to v poriadku? "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "tajn� �asti k���a nie s� dostupn�\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, fuzzy, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Neplatn� heslo; pros�m, sk�ste to znovu"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VAROVANIE: Zisten� slab� k��� - zme�te, pros�m, znovu heslo.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "generujem zastaral� 16 bitov� kontroln� s��et na ochranu tajn�ho k���a\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "vytvoren� slab� k��� - sk��am znovu\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "nem��em sa vyvarova� slab�ho k���a pre symetrick� �ifru; oper�ciu som sk�sil "
 "%d kr�t!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROVANIE: konflikt hashu podpisu v spr�ve\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VAROVANIE: podpisovac� podk��� %08lX nie je kr��ovo certifikovan�\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "VAROVANIE: podpisovac� podk��� %08lX m� neplatn� kr��ov� certifik�ciu\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, fuzzy, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5625,7 +5630,7 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, fuzzy, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5633,52 +5638,36 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, fuzzy, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "POZN�MKA: podpisov�mu k���u %08lX skon�ila platnos� %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "predpoklad�m neplatn� podpis k���om %08lX, preto�e je nastaven� nezn�my "
 "kritick� bit\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "k��� %08lX: neexistuje podk��� pre revok�ciu k���a\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "k��� %08lX: neexistuje podk��� pre viazanie podk���ov\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "nem��em prida� dodato�n� �daje do v3 (PGP 2.x �t�l) podpisov\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "nem��em prida� dodato�n� �daje do v3 (PGP 2.x �t�l) podpisov k���ov\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VAROVANIE: nemo�no %%-expandova� not�cie (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "nem��em prida� politiku URL do v3 (PGP 2.x �t�l) podpisov\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "nem��em prida� politiku URL do v3 (PGP 2.x �t�l) podpisov k���ov\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5686,7 +5675,7 @@ msgstr ""
 "VAROVANIE: nem��em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5695,76 +5684,76 @@ msgstr ""
 "VAROVANIE: nem��em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytvori� len oddelen� podpis k���a vo form�te PGP-2.x\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "podpisujem:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� �itate�n� podpisy len s k���mi form�tu PGP-2."
 "x\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�it� �ifrovanie %s\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "k��� nie je ozna�en� ako nedostato�ne bezpe�n� - nem��em ho pou�i� s "
 "falo�n�m RNG!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "presko�en� `%s': duplikovan�\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "presko�en� `%s': %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "presko�en� `%s': toto je vygenerovan� PGP k��� pod�a algoritmu ElGamal,\n"
 "podpisy vytvoren� t�mto k���om nie s� bezpe�n�!\n"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5773,350 +5762,350 @@ msgstr ""
 "# Zoznam pridelen�ch hodn�t d�veryhodnosti, vytvoren� %s\n"
 "# (Pou�ite \"gpg --import-ownertrust\" na obnovenie)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, fuzzy, c-format
 msgid "error in `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 #, fuzzy
 msgid "line too long"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ""
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 #, fuzzy
 msgid "invalid fingerprint"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 #, fuzzy
 msgid "ownertrust value missing"
 msgstr ""
 "importova� hodnoty d�veryhodnosti\n"
 " vlastn�ka k���a"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, fuzzy, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "chyba pri h�adan� z�znamu d�very: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
 msgstr "chyba pri ��tan�: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "datab�za d�very: synchroniz�cia zlyhala %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "z�znam v datab�ze d�very %lu: lseek() sa nepodaril: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "z�znam v datab�ze d�very %lu: z�pis sa nepodaril (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "transakcia s datab�zou d�very je pr�li� dlh�\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, fuzzy, c-format
 msgid "can't access `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adres�r neexistuje!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, fuzzy, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, fuzzy, c-format
 msgid "can't lock `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepodarilo sa vytvori� z�znam verzie: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: vytvoren� neplatn� datab�za d�very\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: datab�za d�very vytvoren�\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "POZN�MKA: do trustdb nemo�no zapisova�\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatn� datab�ze d�very\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba pri aktualiz�cii z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba pri ��tan� z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: chyba pri z�pise z�znamu verzie: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "datab�ze d�very: proced�ra lseek() zlyhala: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nie je s�bor datab�zy d�very\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: z�znam verzie s ��slom %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatn� verzia s�boru %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: chyba pri z�pise adres�rov�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulovanie z�znamu zlyhalo: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: pridanie z�znamu zlyhalo: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "datab�za d�very je po�koden�; pros�m spustite \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nem��em pracova� s riadkami dlh��mi ako %d znakov\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "vstupn� riadok je dlh�� ako %d znakov\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' nie je platn� dlh� keyID\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "k��� %08lX: akceptovan� ako d�veryhodn� k���\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "k��� %08lX sa v datab�ze d�very vyskytuje viac ako raz\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "k��� %08lX: nen�jden� verejn� k��� k d�veryhodn�mu k���u - presko�en�\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "k��� ozna�en� ako absol�tne d�veryhodn�.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "z�znam d�very %lu, typ po�. %d: ��tanie zlyhalo: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "z�znam d�very %lu nie je po�adovan�ho typu %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revokovan�]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expirovan�]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nezn�me"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "nikdy     "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�ia kontrola datab�zy d�very %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m vykonajte --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "kontrolujem datab�zu d�very\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d k���ov spracovan�ch (%d po�tov platnosti vymazan�ch)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "neboli n�jden� �iadne absol�tne d�veryhodn� k���e\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "verejn� k��� k absol�tne d�veryhodn�mu k���u  %08lX nebol n�jden�\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, fuzzy, c-format
 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:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6131,309 +6120,322 @@ msgstr ""
 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"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "v�eobecn� chyba"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "nezn�my typ paketu"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "nezn�ma verzia"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "nezn�my algoritmus verejn�ho k���a"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "nezn�my hashovac� algoritmus"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "neplatn� verejn� k���"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "neplatn� tajn� k���"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "neplatn� podpis"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "chyba kontroln�ho s��tu"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "nespr�vne heslo"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "verejn� k��� nen�jden�"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "nezn�my �ifrovac� algoritmus"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "nem��em otvori� s�bor k���ov"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "neplatn� paket"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "neplatn� sp�sob reprezent�cie v ASCII"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "u��vate� s t�mto id neexistuje"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "tajn� k��� nie je dostupn�"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "bol pou�it� nespr�vny tajn� k���"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "nepodporovan�"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "nespr�vny k���"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "chyba pri ��tan� s�boru"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "chyba pri z�pise s�boru"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "nezn�my kompresn� algoritmus"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "chyba pri otv�ran� s�boru"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "chyba pri vytv�ran� s�boru"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "nespr�vne heslo"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmus verejn�ho k���a nie je implementovan�"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "�ifrovac� algoritmus nie je implementovan�"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "nezn�ma trieda podpisu"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "chyba v datab�ze d�very"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "nespr�vne MPI"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "obmedzenie zdrojov"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "neplatn� s�bor k���ov"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "nespr�vny certifik�t"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "nespr�vny form�t id u��vate�a"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "chyba pri zatv�ran� s�boru"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "chyba pri premenov�van� s�boru"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "chyba pri mazan� s�boru"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "neo�ak�van� d�ta"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "konflikt �asov�ho raz�tka"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "nepou�ite�n� algoritmus s verejn�m k���om"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "s�bor existuje"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "slab� k���"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "neplatn� argument"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "nespr�vne URI"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "toto URI nie je podporovan�"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "chyba siete"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "neza�ifrovan�"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "nespracovan�"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "nepou�ite�n� verejn� k���"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "nepou�ite�n� tajn� k���"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "chyba servera k���ov"
 
-#: util/errors.c:109
+#: util/errors.c:107
 #, fuzzy
 msgid "canceled"
 msgstr "Zru�i�"
 
-#: util/errors.c:110
+#: util/errors.c:108
 #, fuzzy
 msgid "no card"
 msgstr "neza�ifrovan�"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "ch�baj� podp�san� d�ta\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr ""
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr ""
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... toto je chyba v programe (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "n�jden� chyba v programe ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "ano"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "aAyY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "nie"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "ukon�i�"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "uUqQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr ""
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr ""
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 #, fuzzy
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "VAROVANIE: Pou��van� pam� nie je bezpe�n�!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "Viac inform�ci� n�jdete na adrese http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "vykonanie oper�cie nie je mo�n� bez inicializovanej bezpe�nej pam�te\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "nem��em prida� dodato�n� �daje do v3 (PGP 2.x �t�l) podpisov\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "nem��em prida� dodato�n� �daje do v3 (PGP 2.x �t�l) podpisov k���ov\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "nem��em prida� politiku URL do v3 (PGP 2.x �t�l) podpisov\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr "nem��em prida� politiku URL do v3 (PGP 2.x �t�l) podpisov k���ov\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA po�aduje pou�itie 160 bitov�ho hashovacieho algoritmu\n"
 
diff --git a/po/sv.po b/po/sv.po
index eeab39384..b53a0df12 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+0200\n"
 "PO-Revision-Date: 2007-02-22 00:33+0100\n"
 "Last-Translator: Daniel Nylander <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -32,91 +32,91 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "kan inte generera primtal med pbits=%u qbits=%u\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "kan inte generera ett primtal med mindre än %d bitar\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "ingen entropi-insamlingsmodul identifierades\n"
 
 # se förra kommentaren
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "kan inte låsa \"%s\": %s\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "väntar på lås på \"%s\"...\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan inte ta status på \"%s\": %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" är inte en vanlig fil - ignoreras\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "observera: filen random_seed är tom\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "VARNING: ogiltig storlek på filen random_seed - används inte\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan inte läsa \"%s\": %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "observera: filen random_seed är inte uppdaterad\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan inte skriva \"%s\": %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan inte stänga \"%s\": %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VARNING: använder en osäker slumptalsgenerator!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -130,7 +130,7 @@ msgstr ""
 "ANVÄND INTE DATA SOM GENERERATS AV DETTA PROGRAM!!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -140,7 +140,7 @@ msgstr ""
 "hjälper dig från att bli uttråkad, det förbättrar kvaliteten på\n"
 "insamlat entropidata.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -152,62 +152,62 @@ msgstr ""
 "för att ge operativsystemet en chans att samla in mer entropidata!\n"
 "(behöver %d fler byte)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "misslyckades med att lagra fingeravtrycket: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "misslyckades med att lagra datum för skapandet: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "läsning av publik nyckel misslyckades: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr "svaret innehåller inte publikt nyckeldata\n"
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr "svaret innehåller inte en RSA-modulus\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svaret innehåller inte den publika RSA-exponenten\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-återanrop returnerade fel: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "validering av CHV%d misslyckades: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr "fel när CHV-status hämtades från kortet\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr "kortet är permanent låst!\n"
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d försök för Admin PIN-koden återstår innan kortet låses permanent\n"
@@ -215,186 +215,191 @@ msgstr "%d försök för Admin PIN-koden återstår innan kortet låses permanen
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN-kod"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN-kod"
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN-kod"
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fel när ny PIN-kod hämtades: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 msgid "error reading application data\n"
 msgstr "fel vid läsning av programdata\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 msgid "error reading fingerprint DO\n"
 msgstr "fel vid läsning av fingeravtryckets DO\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 msgid "key already exists\n"
 msgstr "nyckeln finns redan\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr "befintlig nyckel kommer att ersättas\n"
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 msgid "generating new key\n"
 msgstr "genererar ny nyckel\n"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr "tidsstämpel för skapandet saknas\n"
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modulus saknas eller är inte %d bitar stor\n"
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "Publik RSA-exponent saknas eller större än %d bitar\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA-primtal %s saknas eller inte %d bitar stor\n"
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "misslyckades med att lagra nyckeln: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr "var god vänta under tiden nyckeln genereras ...\n"
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 msgid "generating key failed\n"
 msgstr "nyckelgenereringen misslyckades\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "nyckelgenereringen är färdig (%d sekunder)\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer skapade hittills: %lu\n"
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "validering av Admin PIN-kod är för närvarande förbjudet genom detta "
 "kommando\n"
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII-skal: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "ogiltig rubrikrad i ASCII-skalet: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "ASCII-skal: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "ogiltig rubrikrad i klartextsignatur\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "ASCII-skal: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "flera klartextsignaturer går in i varandra\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 msgid "unexpected armor: "
 msgstr "oväntat skal: "
 
 # rader i klartexten som inleds med bindestreck får ett extra bindestreck vid klartextsignatur (för att lättare hitta "---- Begin ..."
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "ogiltig rad som börjar med bindestreck: "
 
 # överhoppad eller hoppades över?
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "ogiltigt radix64-tecken %02X hoppades över\n"
 
 # CRC Cyclic Redundancy Checksum används för att upptäcka fel i ascii-skalet. Används allmänt, trots att det inte höjer säkerheten.
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "för tidigt filslut (ingen CRC-summa)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "för tidigt filslut (i CRC-summan)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "felformaterad CRC-summa\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-fel; %06lX - %06lX\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 msgid "premature eof (in trailer)\n"
 msgstr "för tidigt filslut (i den avslutande raden)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "fel i avslutande rad\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ogiltigt ASCII-skal: raden är längre än %d tecken\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -403,163 +408,163 @@ msgstr ""
 "beror sannolikt på att en felaktig e-postserver eller e-postklient har "
 "använts\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kort nr. %s identifierades\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "kan inte göra detta i satsläge\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr "[inte inställt]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 msgid "male"
 msgstr "man"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "female"
 msgstr "kvinna"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "unspecified"
 msgstr "ej angiven"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "not forced"
 msgstr "inte tvingad"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr "tvingad"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fel: Endast ren ASCII tillåts för närvarande.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fel: Tecknet \"<\" får inte användas.\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fel: Dubbla blanksteg tillåts inte.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr "Kortinnehavarens efternamn: "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr "Kortinnehavarens förnamn: "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Fel: Fullständigt namn för långt (gränsen är %d tecken).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 msgid "URL to retrieve public key: "
 msgstr "Url för att hämta publik nyckel: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fel: URL:en är för lång (gränsen är %d tecken).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr "Inloggningsdata (kontonamn): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Fel: Inloggningsdata är för långt (gräns är %d tecken).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Fel: Privat DO för långt (gränsen är %d tecken).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 msgid "Language preferences: "
 msgstr "Språkinställningar: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fel: ogiltig längd på inställningssträngen\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Kön ((M)an, Kvinna(F) eller blanksteg): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 msgid "Error: invalid response.\n"
 msgstr "Fel: ogiltigt svar.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtryck: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fel: ogiltigt formaterat fingeravtryck.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "nyckelåtgärden är inte möjlig: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 msgid "not an OpenPGP card"
 msgstr "inte ett OpenPGP-kort"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fel när aktuell nyckelinformation hämtades: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr "Ersätt existerande nyckel? (j/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Skapa säkerhetskopia av krypteringsnyckel utanför kortet? (J/n) "
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr "Ersätt existerande nycklar? (j/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -570,139 +575,139 @@ msgstr ""
 "   PIN-kod = \"%s\"     Admin PIN-kod = \"%s\"\n"
 "Du bör ändra dem med kommandot --change-pin\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 msgid "Please select the type of key to generate:\n"
 msgstr "Välj vilken typ av nyckel som ska genereras:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signeringsnyckel\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnyckel\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Ogiltigt val.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 msgid "Please select where to store the key:\n"
 msgstr "Välj var nyckeln ska sparas:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 msgid "unknown key protection algorithm\n"
 msgstr "okänd nyckelskyddsalgoritm\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 msgid "secret parts of key are not available\n"
 msgstr "hemliga delar av nyckeln är inte tillgängliga.\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 msgid "secret key already stored on a card\n"
 msgstr "hemlig nyckel redan lagrad på ett kort\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "show admin commands"
 msgstr "visa administratörskommandon"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "list all available data"
 msgstr "lista allt tillgängligt data"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr "ändra kortinnehavarens namn"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr "ändra url för att hämta nyckel"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr "hämta nyckel som anges i kortets url"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change the login name"
 msgstr "ändra inloggningsnamnet"
 
 # originalet borde ha ett value
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "change the language preferences"
 msgstr "ändra språkinställningarna"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr "ändra kortinnehavarens kön"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "change a CA fingerprint"
 msgstr "ändra ett CA-fingeravtryck"
 
 # den låter skum
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr "växla flagga för att tvinga signatur-PIN-kod"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 msgid "generate new keys"
 msgstr "generera nya nycklar"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr "meny för att ändra eller avblockera PIN-koden"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr "validera PIN-koden och lista allt data"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 msgid "Admin-only command\n"
 msgstr "Kommandon endast för administratör\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 msgid "Admin commands are allowed\n"
 msgstr "Administrationskommandon tillåts\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 msgid "Admin commands are not allowed\n"
 msgstr "Administrationskommandon tillåts inte\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (försök med \"help\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 msgid "card reader not available\n"
 msgstr "kortläsaren är inte tillgänglig\n"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Mata in kortet och tryck Return eller \"c\" för att avbryta: "
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "val av openpgp misslyckades: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -711,132 +716,132 @@ msgstr ""
 "Ersätt det nuvarande kortet med det kort som har serienumret:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Tryck Return när du är färdig eller \"c\" för att avbryta: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr "Ange ny Admin PIN-kod: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr "Ange ny PIN-kod: "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr "Ange Admin PIN-kod: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr "Ange PIN-kod: "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 msgid "Repeat this PIN: "
 msgstr "Upprepa denna PIN-kod: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-kod repeterades inte korrekt; försök igen"
 
 # se förra kommentaren
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "nyckeln \"%s\" hittades inte: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fel vid läsning av nyckelblock: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(om du inte anger nyckeln med hjälp av fingeravtrycket)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "kan inte göra så i satsläge utan \"--yes\"\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Ta bort denna nyckel från nyckelringen? (j/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Detta är en hemlig nyckel! - verkligen ta bort den? (j/N) "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "misslyckades med att radera nyckelblock: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "raderat information om ägartillit\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "det finns en hemlig nyckel för publika nyckeln \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "använd flaggan \"--delete-secret-keys\"för att ta bort den först.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel när lösenfras skapades: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "kan inte använda symmetriska ESK-paket pga S2K-läge\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "använder chiffret %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" är redan komprimerad\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "du kan endast kryptera till RSA-nycklar som är högst 2048 bitar långa i --"
 "pgp2-läge\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "läser från \"%s\"\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "kan inte använda IDEA-chiffer för alla nycklar du krypterar till.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -844,7 +849,7 @@ msgstr ""
 "VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -853,165 +858,165 @@ msgstr ""
 "VARNING: tvinga komprimeringsalgoritmen %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s-läget\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypterad för: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-krypterad data\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypterad med en okänd algoritm %d\n"
 
 # I vissa algoritmer kan svaga nycklar förekomma. Dessa ska inte användas.
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VARNING: meddelandet krypterades med en svag nyckel\n"
 "i den symmetriska krypteringen.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "problem vid hanteringen av krypterat paket\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "ingen körning av fjärrprogram stöds\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
 # Behörighet att komma åt inställningarna, tror jag. Inte behörigheter i inställningsfilen.
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "anrop av externa program är inaktiverat pga osäkra behörigheter för\n"
 "inställningsfilen\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "denna plattform kräver temporärfiler vid anrop till externa program\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "kunde inte köra programmet \"%s\": %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "kunde inte köra skalet \"%s\": %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "systemfel när externa program anropades: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "externt program avslutades felaktigt\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "kunde inte köra det externa programmet\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "kan inte läsa svaret från det externa programmet: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) \"%s\": %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VARNING: kunde inte ta bort temp-katalogen \"%s\": %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 msgid "export signatures that are marked as local-only"
 msgstr "exportera signaturer som är märkta som endast lokala"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "exportera attribut i användaridentiteter (vanligtvis foto-id)"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "exportera spärrnycklar markerade som \"känslig\""
 
-#: g10/export.c:67
+#: g10/export.c:65
 msgid "remove the passphrase from exported subkeys"
 msgstr "ta bort lösenfrasen från exporterade undernycklar"
 
-#: g10/export.c:69
+#: g10/export.c:67
 msgid "remove unusable parts from key during export"
 msgstr "ta bort oanvändbara delar från nyckeln vid exportering"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr "ta bort så mycket som möjligt från nyckeln vid exportering"
 
-#: g10/export.c:325
+#: g10/export.c:323
 msgid "exporting secret keys not allowed\n"
 msgstr "export av hemliga nycklar tillåts inte\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "nyckeln %s: inte skyddad - hoppade över\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "nyckeln %s: nyckel av PGP 2.x-typ - hoppade över\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "nyckeln %s: nyckelmaterial på kortet - hoppade över\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr "på väg att exportera en oskyddad undernyckel\n"
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "misslyckades med att ta bort skydd på undernyckel: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VARNING: hemliga nyckeln %s har ingen enkel SK-kontrollsumma\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: ingenting exporterat\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -1019,129 +1024,129 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartextsignatur"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "endast symmetrisk kryptering"
 
 # gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "validera en signatur"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "lista nycklar"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "lista nycklar och signaturer"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "list and check key signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "lista nycklar och fingeravtryck"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "lista hemliga nycklar"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den publika nyckelringen"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "importera/slå samman nycklar"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr "skriv ut kortstatus"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr "ändra data på ett kort"
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr "ändra PIN-kod för ett kort"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1151,53 +1156,53 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|ställ in komprimeringsnivån till N (0 för att inaktivera)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "utförlig"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "fråga innan överskrivning"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr "använd strikt OpenPGP-beteende"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr "generera PGP 2.x-kompatibla meddelanden"
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1205,7 +1210,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1225,18 +1230,18 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Rapportera fel till <[email protected]>\n"
 "Skicka synpunkter på översättningen till <[email protected]>\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1246,7 +1251,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1254,74 +1259,74 @@ msgstr ""
 "\n"
 "Algoritmer som stöds:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "Publik nyckel: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VARNING: osäkert ägarskap på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VARNING: osäkert ägarskap på konfigurationsfilen \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VARNING: osäkert ägarskap på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VARNING: osäkra rättigheter på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VARNING: osäkra rättigheter på konfigurationsfilen \"%s\"\n"
 
 # Extension är vad? FIXME
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VARNING: osäkra rättigheter på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1329,19 +1334,19 @@ msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen \"%"
 "s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för tillägget \"%s\"\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1349,558 +1354,558 @@ msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för tillägget \"%s\"\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id vid nyckellistning"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er vid signaturlistningar"
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer vid signaturlistningar"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer vid signaturlistningar"
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer vid signaturlistningar"
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar vid signaturlistningar"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar"
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum vid signaturlistningar"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "chiffertillägget \"%s\" lästes inte in på grund av osäkra rättigheter\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id vid signaturvalidering"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er vid signaturvalidering"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer vid signaturvalidering"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer vid signaturvalidering"
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer vid signaturvalidering"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver vid signaturvalidering"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte ställa in exec-path till %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr "ogiltig auto-key-locate-lista\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "OBSERVERA: %s är inte tillgänglig i den här versionen\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kommer inte att köra med osäkert minne på grund av %s\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra signaturer i en separat fil eller klartextsignaturer\n"
 "i --pgp2-läge\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
 
 # IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering av meddelanden i --pgp2-läge kräver IDEA-chiffret\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vald algoritm för certifieringssammandrag är felaktig\n"
 
 # antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
 
 # antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
 # Hur djupt GnuPG ska leta i Web-of-trust.
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth måste vara inom intervallet från 1 till 255\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "ogiltigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "ogiltiga standardinställningar\n"
 
 # Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av föredragna krypteringsalgoritmer\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnamn]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --sign --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "för många poster i pk-cachen - inaktiverad\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 msgid "[User ID not found]"
 msgstr "[Användaridentiteten hittades inte]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "hämtade \"%s\" automatiskt via %s\n"
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemlig undernyckel för publika undernyckeln %s - hoppar över\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %s: hemlig nyckel utan publik nyckel - hoppades över\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "ta nycklarna från denna nyckelring "
 
 # Med detta kommando ger gnupg enbart en varning när ett meddelande är tidsstämplat i framtiden. Annars avslutas gnupg med ett felmeddelande.
 # Kommandot är avsett att användas i "near online system".
 # Krav från RIPE.
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Användning: gpgv [flaggor] [filer] (-h för hjälp)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1908,7 +1913,7 @@ msgstr ""
 "Syntax: gpg [flaggor] [filer]\n"
 "Kontrollera signaturerna mot kända nycklar\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1919,7 +1924,7 @@ msgstr ""
 "\"Web of trust\". Det har inget att göra med det (implicit skapade)\n"
 "nätet av certifikat."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1931,17 +1936,17 @@ msgstr ""
 "- det är vanligen de nycklar som du disponerar den hemliga nyckeln för.\n"
 "Svara  \"ja\" för att markera att du litar förbehållslöst på denna nyckel.\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Om du vill använda denna otillförlitliga nyckel ändå, svara \"ja\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Ange användaridentiteten för den adressat du vill skicka meddelandet till."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1966,7 +1971,7 @@ msgstr ""
 "Första (primär) nyckel måste alltid vara en nyckel som är kapabel att "
 "signera."
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1976,16 +1981,16 @@ msgstr ""
 "och kryptering. Denna algoritm ska endast användas inom särskilda\n"
 "områden. Rådgör med din egen säkerhetsexpert först!"
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Ange storleken på nyckeln"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Svara \"ja\" eller \"nej\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1997,19 +2002,19 @@ msgstr ""
 "inte att få något vettigt felmeddelande - istället kommer systemet\n"
 "att försöka tolka det angivna värdet som ett intervall."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Ange namnet på nyckelns ägare"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "ange en e-postadress. Detta är frivilligt, men rekommenderas varmt"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Ange en kommentar (frivilligt)"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2023,11 +2028,11 @@ msgstr ""
 "O  för att fortsätta med nyckelgenerering.\n"
 "Q  för att avsluta nyckelgenereringen."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Svara \"ja\" (eller bara \"j\") om du vill generera denna undernyckel."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2110,11 +2115,11 @@ msgstr ""
 "Om du inte vet vad du ska svara, så svara \"0\"."
 
 # felstavat original meddelat till Werner.
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Svara \"ja\" om du vill signera ALLA användaridentiteter"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2122,11 +2127,11 @@ msgstr ""
 "Svara \"ja\" om du verkligen vill ta bort denna användaridentitet.\n"
 "Alla certifikat kommer att gå förlorade!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Svara \"ja\" om du vill ta bort denna undernyckel"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2137,7 +2142,7 @@ msgstr ""
 "en tillitskoppling till nyckeln eller en annan nyckel som är\n"
 "certifierad av denna nyckel."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2149,7 +2154,7 @@ msgstr ""
 "vet vilken nyckel som användes eftersom den nyckeln kanske upprättar\n"
 "en tillitskoppling genom en annan redan certifierad nyckel."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2158,7 +2163,7 @@ msgstr ""
 "din nyckelring."
 
 # borde inge GnuPG bytas ut mot gpg eller ännu bättre %s?
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2172,7 +2177,7 @@ msgstr ""
 "mer. Så gör bara detta om denna självsignatur av någon anledning är\n"
 "ogiltig och det finns en andra signatur som tillgänglig."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2184,24 +2189,24 @@ msgstr ""
 "påverkade\n"
 "självsignaturer kommer att flyttas fram en sekund.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Ange en lösenfras. Detta är en hemlig mening\n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Repetera sista lösenfrasen, så du är säker på vad du skrev in."
 
 # # felstavat/ologiskt original
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "Ange namnet på den fil signaturen gäller"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Svara \"ja\" om du vill skriva över filen"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2209,7 +2214,7 @@ msgstr ""
 "Ange ett nytt filnamn. Om du bara trycker RETUR kommer standarfilnamnet\n"
 "(som anges i hakparenteser) att användas."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2239,7 +2244,7 @@ msgstr ""
 "     skall användas. Detta används normalt för att visa att en e-postadress\n"
 "     är ogiltig.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2250,537 +2255,537 @@ msgstr ""
 "och koncis.\n"
 "En tom rad avslutar texten.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "Det finns ingen hjälp tillgänglig"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr "importera signaturer som är markerade som endast lokala"
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr "reparera skada från pks-nyckelservern vid importering"
 
-#: g10/import.c:100
+#: g10/import.c:98
 msgid "do not update the trustdb after import"
 msgstr "uppdatera inte tillitsdatabasen efter importering"
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr "skapa en publik nyckel när en hemlig nyckel importeras"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr "acceptera endast uppdateringar till befintliga nycklar"
 
-#: g10/import.c:106
+#: g10/import.c:104
 msgid "remove unusable parts from key after import"
 msgstr "ta bort oanvändbara delar från nyckeln efter importering"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr "ta bort så mycket som möjligt från nyckeln efter importering"
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar över block av typen %d\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu nycklar behandlade än så länge\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlade enheter: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        överhoppade nya nycklar: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "       utan användaridentiteter: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "                    importerade: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                    oförändrade: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "        nya användaridentiteter: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               nya undernycklar: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                 nya signaturer: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          nya nyckelspärrningar: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "    antal lästa hemliga nycklar: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    importerade hemliga nycklar: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    oförändrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "               inte importerade: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "             signaturer rensade: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "    användaridentiteter rensade: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "VARNING: nyckeln %s innehåller inställningar för otillgänglig\n"
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 msgid "         algorithms on these user IDs:\n"
 msgstr " algoritmer på dessa användaridentiteter:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": inställning för chifferalgoritmen %s\n"
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": inställning för sammandragsalgoritmen %s\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": inställning för komprimeringsalgoritmen %s\n"
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "det rekommenderas starkt att du uppdaterar dina inställningar\n"
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "och distribuerar denna nyckel igen för att undvika tänkbara problem\n"
 "med att algoritmerna inte stämmer\n"
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nyckel %s: ingen användaridentitet\n"
 
 # Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
-#: g10/import.c:750
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nyckeln %s: PKS-skadad undernyckel reparerades\n"
 
 # vad innebär fnutten i slutet?
-#: g10/import.c:765
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "nyckel %s: accepterade icke-självsignerade användaridentiteten \"%s\"\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nyckel %s: inga giltiga användaridentiteter\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero på att det saknas en självsignatur\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nyckel %s: hittade ingen publik nyckel: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nyckel %s: ny nyckel - hoppade över\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:826
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nyckel %s: publika nyckeln \"%s\" importerades\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "nyckel %s: stämmer inte mot vår lokala kopia\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "nyckel %s: kan inte hitta det ursprungliga nyckelblocket: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "nyckel %s: kan inte läsa det ursprungliga nyckelblocket %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nyckel %s: \"%s\" 1 ny användaridentitet\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nyckel %s: \"%s\" %d nya användaridentiteter\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nyckel %s: \"%s\" 1 ny signatur\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nyckel %s: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nyckel %s: \"%s\" 1 ny undernyckel\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nyckel %s: \"%s\" %d nya undernycklar\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "nyckel %s: \"%s\" %d signatur rensad\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "nyckel %s: \"%s\" %d signaturer rensade\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "nyckel %s: \"%s\" %d användaridentitet rensat\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "nyckel %s: \"%s\" %d användaridentiteter rensade\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nyckel %s: \"%s\" inte ändrad\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "nyckel %s: hemlig nyckel med ogiltigt chiffer %d - hoppade över\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "import av hemliga nycklar tillåts inte\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nyckel %s: hemlig nyckel importerades\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "nyckel %s: finns redan i hemliga nyckelringen\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "nyckel %s: hittade inte hemlig nyckel: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "nyckel %s: ingen publik nyckel - kan inte verkställa spärrcertifikat\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - avvisat\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nyckel %s: ingen användaridentitet för signaturen\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "nyckel %s: algoritmen för publika nycklar stöds inte för "
 "användaridentiteten  \"%s\"\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "nyckel %s: ogiltig självsignatur på användaridentiteten \"%s\"\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nyckel %s: ingen undernyckel för nyckelbindning\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %s: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nyckel %s: tog bort flera undernyckelbindningar\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nyckel %s: ingen undernyckel för nyckelspärrning\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nyckel %s: ogiltig spärr av undernyckel\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nyckel %s: tog bort flera spärrar av undernyckel\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nyckel %s: hoppade över användaridentiteten \"%s\"\n"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nyckel %s: hoppade över undernyckel\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "nyckel %s: icke-exporterbar signatur (klass 0x%02X) - hoppade över\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "nyckel %s: spärrcertifikat på fel plats - hoppade över\n"
 
 # nyckeln eller certifikatet??
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - hoppade över\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "nyckel %s: signatur på undernyckel på fel plats - hoppade över\n"
 
 # nyckeln eller klassen?
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "nyckel %s: oväntad signaturklass  (0x%02X) - hoppade över\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 "nyckel %s: dubblett av användaridentiteten hittades - slog samman dem\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "VARNING: nyckeln %s kan ha spärrats: hämtar spärrnyckeln %s\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VARNING: nyckeln %s kan ha spärrats: spärrnyckeln %s saknas.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat lades till\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 "OBSERVERA: serienumret för en nyckel stämmer inte med kortets serienummer\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "OBSERVERA: primärnyckeln är ansluten och lagrad på kort\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "OBSERVERA: sekundärnyckeln är ansluten och lagrad på kort\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "nyckelblockresurs \"%s\": %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[spärr]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[självsignatur]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur validerades inte eftersom nyckeln saknades\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer validerades inte eftersom nycklar saknades\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur validerades inte eftersom ett fel uppstod\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer validerades inte eftersom fel uppstod\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 användaridentitet utan giltig självsignatur hittades\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d användaridentiteter utan giltiga självsignaturer hittades\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2791,17 +2796,17 @@ msgstr ""
 "korrekt validera andra användares nycklar (genom att undersöka pass,\n"
 "undersöka fingeravtryck från olika källor, etc.)\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Jag litar marginellt\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Jag litar fullständigt\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2811,46 +2816,46 @@ msgstr ""
 "Ett djup större än 1 tillåter att nyckeln som du signerar kan\n"
 "skapa tillitssignaturer åt dig.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Ange en domän för att begränsa denna signatur. eller Enter för ingen.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Användaridentiteten \"%s\" är spärrad."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Giltighetstiden för användaridentiteten \"%s\" har gått ut."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Användaridentiteten \"%s\" är inte självsignerad."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Användaridentiteten \"%s\" är signerbar.  "
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "Signera den? (j/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2859,11 +2864,11 @@ msgstr ""
 "Självsignaturen på \"%s\"\n"
 "är en signatur av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vill du göra om den till en självsignatur av OpenPGP-typ? (j/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2872,13 +2877,13 @@ msgstr ""
 "Giltighetstiden för din nuvarande signatur på \"%s\"\n"
 "har gått ut.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/"
 "n) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2887,44 +2892,44 @@ msgstr ""
 "Din nuvarande signatur på \"%s\"\n"
 "är en lokal signatur.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vill du ändra den till en fullständig exporterbar signatur? (j/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" var redan lokalt signerad med nyckeln %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" var redan signerad av nyckeln %s\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Vill du verkligen signera den igen ändå?(j/N)"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Det finns inget att signera med nyckeln %s\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Giltighetstiden för denna nyckel har gått ut!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denna nyckels giltighetstid går ut vid %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2932,11 +2937,11 @@ msgstr ""
 "Du kan inte göra en OpenPGP-signatur på en PGP 2.x-nyckel när du är i --pgp2-"
 "läge\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Detta skulle göra nyckeln oanvändbar i PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2945,31 +2950,31 @@ msgstr ""
 "Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillhör\n"
 "personen som nämns ovan?  Om du inte vet vad du ska svara, svara \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Jag vill inte svara.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Jag har inte kontrollerat alls.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Jag har gjort viss kontroll.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Jag har gjort en noggrann kontroll.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ditt val? (skriv \"?\" för mer information): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2978,76 +2983,76 @@ msgstr ""
 "Är du verkligen säker på att du vill signera denna nyckel\n"
 "med din nyckel \"%s\" (%s)\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 msgid "This will be a self-signature.\n"
 msgstr "Detta kommer att bli en självsignatur.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "VARNING: signaturen kommer inte att markeras som icke-exporterbar.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "VARNING: signaturen kommer att markeras som icke-spärrbar.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Signaturen kommer att markeras som icke-exporterbar.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Signaturen kommer att märkas som icke möjlig att spärra.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "I have not checked this key at all.\n"
 msgstr "Jag har inte kontrollerat denna nyckel alls.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 msgid "I have checked this key casually.\n"
 msgstr "Jag har gjort viss kontroll av denna nyckel.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 msgid "I have checked this key very carefully.\n"
 msgstr "Jag har gjort en noggrann kontroll av denna nyckel.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 msgid "Really sign? (y/N) "
 msgstr "Verkligen signera? (j/N) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras "
 "att ändra.\n"
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "De hemliga delarna av den primära nyckeln är inte tillgängliga.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemliga delar av den primära nyckeln är lagrade på kortet.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "Nyckeln är skyddad.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3055,11 +3060,11 @@ msgstr ""
 "Skriv in den nya lösenfrasen för den hemliga nyckeln.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenfrasen repeterades inte korrekt; försök igen."
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3067,191 +3072,191 @@ msgstr ""
 "Du vill inte ha någon lösenfras - detta är möjligen en *dålig* idé!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vill du verkligen göra detta? (j/N) "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "visa nyckelns fingeravtryck"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "lista nycklar och användaridentiteter"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "välj användaridentiteten N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "välj undernyckel N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "kontrollera signaturer"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "signera valda användaridentiteter [* se nedan för relaterade kommandon]"
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs locally"
 msgstr "signera valda användaridentiteter lokalt"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a trust signature"
 msgstr "signera valda användaridentiteter med en tillitssignatur"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "signera valda användaridentiteter med en icke-spärrbar signatur"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "lägg till ett foto-id"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 msgid "delete selected user IDs"
 msgstr "ta bort valda användaridentiteter"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "add a subkey"
 msgstr "lägg till en undernyckel"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr "lägg till en nyckel till ett smartkort"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr "flytta en nyckel till ett smartkort"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr "flytta en nyckelkopia till ett smartkort"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 msgid "delete selected subkeys"
 msgstr "ta bort valda undernycklar"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "lägg till en spärrnyckel"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 msgid "delete signatures from the selected user IDs"
 msgstr "ta bort signaturer från valda användaridentiteter"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "ändra utgångsdatumet för nyckeln eller valda undernycklar"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 msgid "flag the selected user ID as primary"
 msgstr "flagga vald användaridentitet som primär"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 msgid "toggle between the secret and public key listings"
 msgstr "växla mellan att lista hemliga och publika nycklar"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "lista inställningar (expertläge)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "lista inställningar (utförligt)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "set preference list for the selected user IDs"
 msgstr "ställ in inställningslista för valda användaridentiteter"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "ställ in url till föredragen nyckelserver för valda användaridentiteter"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 msgid "set a notation for the selected user IDs"
 msgstr "ställ in en notation för valda användaridentiteter"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "ändra lösenfrasen"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 msgid "revoke signatures on the selected user IDs"
 msgstr "spärra signaturer på valda användaridentiteter"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 msgid "revoke selected user IDs"
 msgstr "spärra valda användaridentiteter"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "revoke key or selected subkeys"
 msgstr "spärra nyckel eller valda undernycklar"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 msgid "enable key"
 msgstr "aktivera nyckel"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 msgid "disable key"
 msgstr "inaktivera nyckel"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 msgid "show selected photo IDs"
 msgstr "visa valda foto-id:n"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "komprimera oanvändbara användaridentiteter och ta bort oanvändbara "
 "signaturer från nyckeln"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "komprimera oanvändbara användaridentiteter och ta bort alla signaturer från "
 "nyckeln"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fel vid läsning av hemligt nyckelblock \"%s\": %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Den hemliga nyckeln behövs för att göra detta.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3264,228 +3269,228 @@ msgstr ""
 "signaturer\n"
 "  (nrsign), eller en kombination av dessa (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "Nyckeln är spärrad."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Verkligen signera alla användaridentiteter? (j/N) "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Välj de användaridentiteter som du vill signera\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Okänd signaturtyp \"%s\"\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Verkligen ta bort alla valda användaridentiteter? (j/N) "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 msgid "Really remove this user ID? (y/N) "
 msgstr "Verkligen ta bort denna användaridentitet? (j/N) "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 msgid "Really move the primary key? (y/N) "
 msgstr "Verkligen flytta den primära nyckeln? (j/N) "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 msgid "You must select exactly one key.\n"
 msgstr "Du måste välja exakt en nyckel.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr "Kommandot förväntar ett filnamnsargument\n"
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Kan inte öppna \"%s\": %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Fel vid läsning av säkerhetskopierad nyckel från \"%s\": %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vill du verkligen ta bort denna nyckel? (j/N) "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Verkligen spärra alla valda användaridentiteter? (j/N) "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Verkligen spärra denna användaridentitet? (j/N) "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vill du verkligen spärra hela nyckeln? (j/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vill du verkligen spärra de valda undernycklarna? (j/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vill du verkligen spärra denna undernyckel? (j/N) "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Ägartillit får inte ställas in när en tillitsdatabas används som användaren "
 "tillhandahåller\n"
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 msgid "Set preference list to:\n"
 msgstr "Ställ in inställningslista till:\n"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Vill du verkligen uppdatera inställningarna för valda användaridentiteter? "
 "(j/N) "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 msgid "Really update the preferences? (y/N) "
 msgstr "Vill du verkligen uppdatera inställningarna? (j/N) "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 msgid "Save changes? (y/N) "
 msgstr "Spara ändringar? (j/N) "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? (j/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr "Nyckelserver no-modify"
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Föredragen nyckelserver: "
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Du kan inte ange några inställningar för en användaridentitet av PGP 2.x-"
 "typ.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Den här nyckeln blev spärrad den %s av %s nyckel %s\n"
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Den här nyckeln kan vara spärrad av %s nyckel %s"
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 msgid "(sensitive)"
 msgstr "(känsligt)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, c-format
 msgid "created: %s"
 msgstr "skapat: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, c-format
 msgid "revoked: %s"
 msgstr "spärrad: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "utgånget: %s"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, c-format
 msgid "expires: %s"
 msgstr "går ut: %s"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr "giltighet: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr "kortnummer: "
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3493,17 +3498,17 @@ msgstr ""
 "Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
 "såvida inte du startar om programmet.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "spärrad"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "utgånget"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3512,7 +3517,7 @@ msgstr ""
 "Detta kommando kan göra att en annan användaridentitet antas\n"
 "vara den primära identiteten.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3521,75 +3526,75 @@ msgstr ""
 "VARNING: Detta är en nyckel av PGP2-typ.  Om du lägger till ett foto-id kan\n"
 "         vissa versioner av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan inte lägga till ett foto-id till en nyckel av PGP 2-typ.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Verkligen ta bort denna självsignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "ogiltigt"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Användaridentiteten \"%s\": %d signatur borttagen\n"
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Användaridentiteten \"%s\": %d signaturer borttagna\n"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Användaridentiteten \"%s\": redan minimerad\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Användaridentitet \"%s\": redan rensad\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3599,257 +3604,257 @@ msgstr ""
 "denna\n"
 "         nyckel inte användas i vissa versioner av PGP.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du får inte lägga till en spärrnyckel för en PGP 2.x-nyckel.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användaridentiteten för spärrnyckeln: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "det går inte att använda en PGP 2.x-nyckel som spärrnyckel\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "du kan inte ange en nyckel som sin egen spärrnyckel\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "den här nyckeln har redan markerats som spärrnyckel\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VARNING: det går aldrig att ångra om du utser en spärrnyckel!\n"
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 msgid "Please select at most one subkey.\n"
 msgstr "Välj som mest en undernyckel.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
 # Vad betyder det?
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "undernyckeln %s signerar inte och behöver inte korscertifieras\n"
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Välj endast en användaridentitet.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hoppar över v3-självsignatur på användaridentiteten \"%s\"\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr "Ange din föredragna nyckelserver-url: "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Är du säker på att du vill ersätta det? (j/N) "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Är du säker på att du vill ta bort det? (j/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 msgid "Enter the notation: "
 msgstr "Ange notationen: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 msgid "Proceed? (y/N) "
 msgstr "Fortsätt? (j/N) "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Inget användaridentitet med indexet %d\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Inget användaridentitet med hashen %s\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernyckel med indexet %d\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \"%s\"\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signerat av din nyckel %s den %s%s%s\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Är du säker på att du fortfarande vill spärra den? (j/N)"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)"
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har signerat följande användaridentiteter med nyckeln %s:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 msgid " (non-revocable)"
 msgstr " (inte spärrbar)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "spärrad av din nyckel %s den %s\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du är på väg att spärra dessa signaturer:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "användaridentiteten \"%s\" är redan spärrat\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VARNING: en signatur på en användaridentitet är daterad %d sekunder in i "
 "framtiden\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Visar %s foto-id med storleken %ld för nyckeln %s (uid %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "inställningen \"%s\" förekommer flera gånger\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "för många chifferinställningar\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "för många sammandragsinställningar\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "för många komprimeringsinställningar\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "ogiltig post \"%s\" i inställningssträngen\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "skriver direkt signatur\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "skriver självsignatur\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 msgid "Sign"
 msgstr "Signera"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr "Certifiera"
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 msgid "Encrypt"
 msgstr "Kryptera"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr "Autentisera"
 
@@ -3857,110 +3862,110 @@ msgstr "Autentisera"
 # K = Kryptera
 # A = Authentisera
 # Q = Avsluta
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Möjliga åtgärder för en %s-nyckel: "
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr "För närvarande tillåtna åtgärder: "
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Växla signeringsförmågan\n"
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Växla krypteringsförmågan\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Växla autentiseringsförmågan\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Färdig\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA och Elgamal (standard)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (ställ in dina egna förmågor)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (endast kryptering)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (endast signering)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ställ in dina egna förmågor)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-nyckelparet kommer att ha %u bitar.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s-nycklar kan vara mellan %u och %u bitar långa.\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Vilken nyckelstorlek vill du ha? (%u) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s nyckelstorlekar måste vara inom intervallet %u-%u\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "avrundade uppåt till %u bitar\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3977,7 +3982,7 @@ msgstr ""
 "      <n>y = nyckeln blir ogiltig efter n år\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3993,38 +3998,38 @@ msgstr ""
 "      <n>m = signaturen blir ogiltig efter n månader\n"
 "      <n>y = signaturen blir ogiltig efter n år\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen är giltig hur länge? (%s) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 msgid "Key does not expire at all\n"
 msgstr "Nyckeln går aldrig ut\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen går aldrig ut\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln går ut %s\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen går ut %s\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4032,11 +4037,11 @@ msgstr ""
 "Ditt system kan inte visa datum senare än år 2038.\n"
 "Datum fram till år 2106 kommer dock att hanteras korrekt.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 msgid "Is this correct? (y/N) "
 msgstr "Stämmer detta? (j/N) "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4054,44 +4059,44 @@ msgstr ""
 "    \"Gustav Vasa (Brutal kung) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "E-postadress: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "E-postadressen är ogiltig\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckentabellen \"%s\"\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4102,7 +4107,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 
@@ -4118,24 +4123,24 @@ msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4143,12 +4148,12 @@ msgstr ""
 "Du behöver en lösenfras för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4160,7 +4165,7 @@ msgstr ""
 "om du använder detta program med flaggan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4172,51 +4177,51 @@ msgstr ""
 "hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
 "en större chans att samla ihop en tillräcklig mängd entropidata.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver den publika nyckeln till \"%s\"\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skrier hemliga nyckelstumpen till \"%s\"\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "ingen skrivbar hemlig nyckelring hittades: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "den publika och den hemliga nyckeln är skapade och signerade.\n"
 
 # Flagga.. inte kommando
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4225,13 +4230,13 @@ msgstr ""
 "vill använda flaggan \"--edit-key\" för att skapa en undernyckel för detta "
 "syfte.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4239,7 +4244,7 @@ msgstr ""
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4247,693 +4252,693 @@ msgstr ""
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 msgid "Really create? (y/N) "
 msgstr "Verkligen skapa? (j/N) "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "misslyckades med att lagra nyckeln på kortet: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "aldrig"
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Viktig signaturpolicy: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "Signaturpolicy: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "Föredragen kritisk nyckelserver: "
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Kritisk signaturnotation: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "Signaturnotation: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Nyckelring"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Primära nyckelns fingeravtryck:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "   Undernyckelns fingeravtryck:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr "Primära nyckelns fingeravtryck:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "   Undernyckelns fingeravtryck:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 msgid "      Key fingerprint ="
 msgstr "Nyckelns fingeravtryck ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr "       Kortets serienr ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
 
 # Enligt Werner uppstår detta om något går snett när den hemliga nyckeln uppdateras.
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s är den oförändrade\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s är den nya\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Lös detta potentiella säkerhetsproblem\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "mellanlagrar nyckelringen \"%s\"\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu nycklar mellanlagrade än så länge (%lu signaturer)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu nycklar mellanlagrade (%lu signaturer)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr "inkludera spärrade nycklar i sökresultatet"
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr "inkludera undernycklar vid sökning efter nyckel-id"
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 "använd temporärfiler för att skicka data till nyckelserverns hjälpprogram"
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr "ta inte bort temporärfiler efter de använts"
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "hämta automatiskt nycklar vid validering av signaturer"
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "respektera föredragen nyckelserver-url inställd i nyckeln"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr "respektera PKA-posten inställd på en nyckel när nycklar hämtas"
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "VARNING: nyckelserverflaggan \"%s\" används inte på den här plattformen\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 msgid "disabled"
 msgstr "inaktiverad"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Ange nummer, N)ästa, eller Q) för Avsluta > "
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ogiltigt nyckelserverprotokoll (vi %d!=hanterare %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "nyckeln \"%s\" hittades inte på nyckelservern\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 msgid "key not found on keyserver\n"
 msgstr "nyckeln hittades inte på nyckelservern\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "begär nyckeln %s från %s-servern %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "begär nyckeln %s från %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "söker efter namn från %s-servern %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "söker efter namn från %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "skickar nycken %s till %s-servern %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "skickar nyckeln %s till %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "söker efter \"%s\" från %s-servern %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "söker efter \"%s\" från %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 msgid "no keyserver action!\n"
 msgstr "ingen nyckelserveråtgärd!\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VARNING: nyckelserverhanteraren från en annan version av GnuPG (%s)\n"
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr "nyckelserver skickade inte VERSION\n"
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "ingen nyckelserver är känd (använd flaggan --keyserver)\n"
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "externa anrop till nyckelserver stöds inte i detta bygge\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "ingen hanterare för nyckelserverschemat \"%s\"\n"
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "åtgärden \"%s\" stöds inte med nyckelserverschemat \"%s\"\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s har inte stöd för hanterarversionen %d\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 msgid "keyserver timed out\n"
 msgstr "tidsgräns överstigen för nyckelserver\n"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 msgid "keyserver internal error\n"
 msgstr "internt fel i nyckelserver\n"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "kommunikationsfel mot nyckelserver: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" inte ett nyckel-id: hoppar över\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VARNING: kunde inte uppdatera nyckeln %s via %s: %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "uppdaterar 1 nyckel från %s\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "uppdaterar %d nycklar från %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VARNING: kunde inte hämta uri:n %s: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VARNING: kunde inte tolka uri:n %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "egendomlig storlek på en krypterad sessionsnyckel (%d)\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s krypterad sessionsnyckel\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "lösenfras genererad med okänd sammandragsalgoritm %d\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, 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:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "Data krypterat med publik nyckel: korrekt DEK\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, 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:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypterad med %lu lösenfraser\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypterad med with 1 lösenfras\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar att %s krypterade data\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 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:584
+#: g10/mainproc.c:588
 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:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 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:1187
+#: g10/mainproc.c:1191
 msgid "no signature found\n"
 msgstr "ingen signatur hittades\n"
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "signaturvalidering utelämnad\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan inte hantera detta tvetydliga signaturdata\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur gjord %s\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "             med %s-nyckeln %s\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgången signatur från \"%s\""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, 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:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \"%s\""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "binär"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "okänd"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte kontrollera signaturen: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 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:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ogiltigt rotpaket hittades i proc_tree()\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte stänga av minnesutskrifter: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat för \"%s\" misslyckades i %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) misslyckades i %s: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "VARNING: använder experimentella algoritmen %s för publik nyckel\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "VARNING: använder experimentella chifferalgoritmen %s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "VARNING: använder experimentella sammandragsalgoritmen %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VARNING: sammandragsalgoritmen %s är föråldrad\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "insticksmodul för IDEA-kryptering är inte installerat\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "se %s för mer information\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: alternativet är föråldrat \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Använd \"%s%s\" istället\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VARNING: \"%s\" är ett föråldrat kommando - använd det inte\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "Okomprimerad"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 msgid "uncompressed|none"
 msgstr "okomprimerad|ingen"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "detta meddelande kanske inte kan användas av %s\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "tvetydlig flagga \"%s\"\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "okänd flagga \"%s\"\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Filen \"%s\" finns. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 msgid "Overwrite? (y/N) "
 msgstr "Skriv över? (j/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: okänt suffix\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Ange nytt filnamn"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "skriver till standard ut\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "antar att signerad data finns i filen \"%s\"\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "ny konfigurationsfil \"%s\" skapad\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "VARNING: inställningar i \"%s\" är ännu inte aktiva under denna körning\n"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritmen %d för publika nycklar\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent protokoll version %d stöds inte\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem med agenten - inaktiverar användning av agent\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (primära nyckelns id %s)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4944,27 +4949,27 @@ msgstr ""
 "nyckeln för användaren: \"%.*s\"\n"
 "%u-bitars %s-nyckel, id %s, skapad %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Repetera lösenfrasen\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Ange lösenfrasen\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr "kan inte fråga om lösenfras i satsläge\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Ange lösenfras: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4973,21 +4978,21 @@ msgstr ""
 "Du behöver en lösenfras för att låsa upp den hemliga\n"
 "nyckeln för användaren: \"%s\"\n"
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitars %s-nyckel, id %s, skapad %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (undernyckel på primärt nyckel-id %s)"
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Repetera lösenfrasen: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5001,120 +5006,120 @@ msgstr ""
 "en mycket stor bild, så blir din nyckel också väldigt stor!\n"
 "Försök att använda en bild som har ungefär  formatet 240x288 pixlar.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Skriv JPEG-filnamnet för foto-id: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "kunde inte öppna JPEG-filen \"%s\": %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Den här JPEG-bilden är verkligen stor (%d byte)!\n"
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Vill du verkligen använda den? (j/N)? "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" är inte en JPEG-fil\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Är detta foto korrekt (j/N/a)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr "ingen fotovisare inställd\n"
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "kan inte visa foto-id!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "Ingen anledning har angivits"
 
 # tveksam översättning. funderar på "ersatt av något bättre" men det
 # känns inte heller bra. Betyder att nyckeln inte används längre, utan användaren har skapat en ny nyckel som ersätter den gamla.
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "Nyckeln är ersatt"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "Nyckeln har tappat sin säkerhet"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "Nyckeln används inte längre"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "Användaridentiteten är inte längre giltig"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "anledning för spärrning: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "spärrkommentar: "
 
 # ej kristallklart vad förkortningarna står för
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImHhAsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 msgid "No trust value assigned to:\n"
 msgstr "Inget tillitsvärde tilldelat till:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  även känd som \"%s\"\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "Hur mycket litar du på att nyckeln faktiskt tillhör den angivna användaren?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = Jag vet inte eller kan inte säga något\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = Jag litar INTE\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = Jag litar förbehållslöst\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 msgid "  m = back to the main menu\n"
 msgstr "  h = gå tillbaka till huvudmenyn\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  s = skip this key\n"
 msgstr "  s = hoppa över denna nyckel\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  q = quit\n"
 msgstr "  a = avsluta\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5123,40 +5128,40 @@ msgstr ""
 "Minimum tillitsnivå för denna nyckel är: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Vad väljer du? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vill du verkligen ge denna nyckel förbehållslöst förtroende? (j/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifikat som leder till en nyckel med förbehållslöst förtroende:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Det finns inget som säger att nyckeln tillhör den angivna användaren\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Det finns viss information om att nyckeln tillhör den angivna "
 "användaren\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 msgid "This key probably belongs to the named user\n"
 msgstr "Den här nyckel tillhör antagligen den namngivna användaren\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Denna nyckel tillhör oss\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5166,109 +5171,109 @@ msgstr ""
 "användaridentiteten. Om du *verkligen* vet vad du gör, kan du\n"
 "svara ja på nästkommande fråga.\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 msgid "Use this key anyway? (y/N) "
 msgstr "Vill du använda nyckeln ändå? (j/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VARNING: Använder en nyckel som inte är betrodd!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VARNING: denna nyckel kan ha spärrats (spärrnyckeln saknas)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VARNING: Denna nyckel har spärrats av sin ägare!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Detta kan betyda att signaturen är förfalskad.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VARNING: Denna undernyckel har spärrats av sin ägare!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Obs: Denna nyckel har stängts av.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "Observera: Validerad adress för signeraren är \"%s\"\n"
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr "Observera: Signerarens adress \"%s\" matchar inte DNS-objektet\n"
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr "trustlevel justerad till FULL på grund av giltig PKA-info\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr "trustlevel justerad till NEVER på grund av felaktig PKA-info\n"
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Obs: Giltighetstiden för denna nyckel har gått ut!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VARNING: Denna nyckel är inte certifierad med en pålitlig signatur!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Det finns inget som indikerar att signaturen tillhör ägaren.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VARNING: Vi litar INTE på denna nyckel!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen är sannolikt en FÖRFALSKNING.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VARNING: Denna nyckel är inte certifierad med signaturer med ett\n"
 "tillräckligt högt tillitsvärde!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det är inte säkert att signaturen tillhör ägaren.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: hoppade över: %s\n"
 
 # överhoppad?
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppades över: publik nyckel finns redan\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Du angav ingen användaridentitet. (du kan använda \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr "Nuvarande mottagare:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5276,29 +5281,29 @@ msgstr ""
 "\n"
 "Ange användaridentiteten.  Avsluta med en tom rad: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Inget sådan användaridentitet.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "hoppade över: den publika nyckeln är redan inställd som standardmottagare\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "Den publika nyckeln är inaktiverad.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "hoppade över: publik nyckel redan angiven\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "okänd standardmottagare \"%s\"\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
@@ -5306,95 +5311,95 @@ msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
 # plural av adressee
 # dvs. den som meddelandet är adresserat till.
 # Åtskillnad görs mellan adressee och receiver.
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "inga giltiga adressater\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data sparades inte, använd flaggan \"--output\" för att spara det\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fel när \"%s\" skapades: %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Signatur i en separat fil.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Ange namnet på datafilen: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "läser från standard in ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "ingen signerad data\n"
 
 # se förra kommentaren
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte öppna signerat data \"%s\"\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonym mottagare; provar med den hemliga nyckeln %s ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, vi är den anonyma mottagaren.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "gammal kodning av krypteringsnyckeln stöds inte\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "krypteringsalgoritmen %d%s är okänd eller inaktiverad\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "VARNING: chifferalgoritmen %s hittades inte i mottagarinställningarna\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "OBSERVERA: hemliga nyckeln %s gick ut %s\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "OBSERVERA: nyckeln har spärrats"
 
 # Vad?
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet misslyckades: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "nyckeln %s innehåller inga användaridentiteter\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Kommer att spärras av:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Detta är en känslig spärrnyckel)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 
@@ -5403,52 +5408,52 @@ msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 # -do-not-force översatt med:
 # genomdriv inte
 # I detta fall gäller det ett revokeringscertifikat, som gnupg alltid skapar i ASCII-format för att det ska gå att skriva ut.
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "utdata med ett ascii-skal genomdrivet.\n"
 
 # Vad menas???
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet misslyckades: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Spärrcertifikat skapat.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "inga spärrnycklar hittades för \"%s\"\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "ingen motsvarande publik nyckel: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "publika nyckeln passar inte ihop med den hemliga nyckeln!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "okänd skyddsalgoritm\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "OBS: Denna nyckel är oskyddad!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5466,126 +5471,126 @@ msgstr ""
 "media blir oläsligt.  Men se upp:  Utskriftsfunktionen på\n"
 "din dator kan spara data så att det blir åtkomligt för andra!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "Välj anledning till varför nyckeln spärras:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Troligen vill du välja %d här)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Ange en beskrivning (frivilligt); avsluta med en tom rad:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Anledning för spärrning: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(Ingen beskrivning angiven)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 msgid "Is this okay? (y/N) "
 msgstr "Är detta OK? (j/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "de hemliga nyckeldelarna är inte tillgängliga\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "skyddsalgoritmen %d%s stöds inte\n"
 
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "skyddssammandraget %d stöds inte\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Ogiltig lösenfras; försök igen"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
 # För vissa krypteringsalgoritmer är det känt att vissa svaga nycklar kan förekomma. Dessa ska aldrig användas. GnuPG vill på detta sätt hindra dig från att skapa en sådan nyckel.
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VARNING: Upptäckte en svag nyckel - byt lösenfras igen.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "skapar den föråldrade 16-bit kontrollsumman för skydd av den hemliga "
 "nyckeln\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "skapade en svag nyckel - försöker igen\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "kan inte undvika en svag nyckel för symmetrisk kryptering; försökte\n"
 "%d gånger!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA kräver att hashlängden är delbar med 8 bitar\n"
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr "DSA-nyckeln %s använder en osäker hash (%u bitar)\n"
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr "DSA-nyckeln %s kräver en hash med %u bitar eller större\n"
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VARNING: konflikt mellan signatursammandrag i meddelandet\n"
 
 # Vad betyder det?
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VARNING: signeringsundernyckeln %s är inte korscertifierad\n"
 
 # cross-certification?
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "VARNING signeringsundernyckel  %s har en ogiltig korscertifiering\n"
 
 # behövs verkligen c-format här?
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "den publika nyckeln %s är %lu sekund nyare än signaturen\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "den publika nyckeln %s är %lu sekunder nyare än signaturen\n"
 
 # c-format behövs inte i singularis
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -5593,7 +5598,7 @@ msgstr ""
 "nyckeln %s skapades %lu sekund in i framtiden (tidsresande eller felinställd "
 "klocka)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5601,58 +5606,35 @@ msgstr ""
 "nyckeln %s skapades %lu sekunder in i framtiden (tidsresande eller "
 "felinställd klocka)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "OBSERVERA: signaturnyckeln %s gick ut %s\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "antar felaktig signatur från nyckeln %s på grund av en okänd kritisk bit\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "nyckel %s: ingen undernyckel med spärrsignatur för undernyckel\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "nyckeln %s: ingen undernyckel för signaturbindning av undernyckel\n"
 
-# notation data?
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"kan inte lägga till notationer i signaturer gjorda med en v3-nyckel\n"
-"(PGP 2.x-typ)\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"kan inte lägga till notationer i nyckelsignaturer signaturer gjorda med en "
-"v3-nyckel (PGP 2.x-typ)\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VARNING: kan inte %%-expandera anteckning (för stor).  Använder den utan "
 "expansion.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "kan inte ange en policy-URL i v3 (PGP 2.x style) signaturer\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"kan inte lägga till en policy-URL i signaturer gjorda med en v3-nyckel (PGP "
-"2.x-typ)\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5660,7 +5642,7 @@ msgstr ""
 "VARNING: kunde inte %%-expandera policy-url (för stor).  Använder "
 "oexpanderad.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5669,23 +5651,23 @@ msgstr ""
 "VARNING: kunde inte %%-expandera url för föredragen nyckelserver (för "
 "stor).  Använder oexpanderad.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signatur från: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "du kan bara skapa signaturer i en separat fil med nycklar av PGP 2.x-typ\n"
 "när du är i --pgp2-läge\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5693,53 +5675,53 @@ msgstr ""
 "VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra klartextsignaturer med en PGP 2.x-nyckel\n"
 "när du är i --pgp2-läge\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "krypteringen %s kommer att användas\n"
 
 # Slumptalsgenerator: Random Number Generator
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "nyckeln är inte markerad som osäker - det går inte att använda den med "
 "fejkad slumptalsgenerator!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "hoppade över \"%s\": förekommer flera gånger\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppade över \"%s\": %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "det här är en PGP-genererad Elgamal-nyckel som inte är säker för signaturer!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5748,227 +5730,227 @@ msgstr ""
 "# Skapat lista över tilldelade tillitsvärden %s\n"
 "# (Använd \"gpg --import-ownertrust\" för att återställa dem)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "fel i \"%s\": %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "raden är för lång"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "kolon saknas"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "ogiltigt fingeravtryck"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "värde för ägartillit saknas"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "fel vid sökning av tillitsvärde i \"%s\": %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "läsfel i \"%s\":  %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "tillitsdatabastransaktion för stor\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "kan inte komma åt \"%s\": %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "kan inte skapa lås för \"%s\"\n"
 
 # se förra kommentaren
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "kan inte låsa \"%s\"\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: misslyckades med att skapa versionspost: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ogiltig tillitsdatabas skapad\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tillitsdatabas skapad\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "OBS: det går inte att skriva till tillitsdatabasen\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ogiltig tillitsdatabas\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fel vid uppdatering av versionspost: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fel vid läsning av versionspost: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fel vid skrivning av versionspost: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "tillitsdatabas: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: detta är inte en tillitsdatabasfil\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versionspost med postnummer %lu\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ogiltig filversion %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fel vid läsning av ledig post: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fel vid läsning av katalogpost: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: misslyckades med att nollställa en post: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: misslyckades med att lägga till en post: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "tillitsdatabasen är trasig, kör \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "kan inte hantera text med rader längre än %d tecken\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "indataraden är längre än %d tecken\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "\"%s\" är inget giltigt långt nyckel-id\n"
 
 # trusted??
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "nyckel %s: accepterad som betrodd nyckel\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "nyckeln %s förekommer fler än en gång i tillitsdatabasen\n"
 
 # nyckeln?
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "nyckel %s: ingen publik nyckel för pålitlig nyckel - hoppades över\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "nyckeln %s är markerad med förbehållslöst förtroende\n"
 
 # req står för request
 # kollat med Werner. Per
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "tillitspost %lu, begäran av typ %d: kunde inte läsa: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "tillitsvärdet %lu är inte av begärd typ %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "kunde inte använda okänd tillitsmodell (%d) - antar tillitsmodellen %s\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "använder tillitsmodellen %s\n"
@@ -5982,128 +5964,128 @@ msgstr "använder tillitsmodellen %s\n"
 #    It gets passed to atoi() so everything after the number is
 #    essentially a comment and need not be translated.  Either key and
 #    uid are both NULL, or neither are NULL. */
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "15"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[   spärrad   ]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[   utgånget  ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[    okänt    ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[ odefinierad ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[  marginell  ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[ fullständig ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[förbehållslös]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "odefinierad"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "aldrig"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "marginell"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "fullständig"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "förbehållslös"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "det behövs ingen kontroll av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "det behövs ingen uppdatering av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika nyckeln %s hittades inte: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "gör en kontroll av tillitsdatabasen --check-trustdb\n"
 
 # originalet borde ha ett value
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "kontrollerar  tillitsdatabasen\n"
 
 # Vad är detta!?
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d nycklar behandlade (%d validity counts rensade)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "publik nyckel för förbehållslöst betrodda nyckeln %s hittades inte\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal(er) behövs, %d fullständig(a) behövs, tillitsmodell %s\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "djup: %d  giltig: %3d  signerad: %3d  tillit: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "kunde inte uppdatera versionspost i tillitsdatabasen: skrivning "
 "misslyckades: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6118,307 +6100,326 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "raden %u är för lång, eller saknar nyradstecken\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "allmänt fel"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "okänd pakettyp"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "okänd version"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "okänd algoritm för publik nyckel"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "okänd sammandragsalgoritm"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "felaktig publik nyckel"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "felaktig hemlig nyckel"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "felaktig signatur"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "fel i kontrollsumma"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "felaktig lösenfras"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "publika nyckeln hittades inte"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "okänd chifferalgoritm"
 
 # Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
 # fixa en patch?
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "kan inte öppna nyckelringen"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "ogiltigt paket"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "ogiltigt ascii-skal"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "inget sådan användaridentitet"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "hemliga nyckeln är inte tillgänglig"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "fel hemlig nyckel användes"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "stöds inte"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "felaktig nyckel"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "fel vid läsning av fil"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "fel vid skrivning av fil"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "okänd komprimeringsalgoritm"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "fel vid öppning av fil"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "fel när filen skapades"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "ogiltig lösenfras"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "ej implementerad algoritm för publika nycklar"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "ej implementerad algoritm för chiffer"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "okänd signaturklass"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "fel i tillitsdatabasen"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "felaktig MPI"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "resursbegränsning"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "ogiltig nyckelring"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "felaktigt certifikat"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "felformaterad användaridentitet"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "fel vid stängning av fil"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "fel vid namnbyte av fil"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "fel vid borttagning av fil"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "oväntat data"
 
 # Med detta kommando ger gnupg enbart en varning när ett meddelande är tidsstämplat i framtiden. Annars avslutas gnupg med ett felmeddelande.
 # Kommandot är avsett att användas i "near online system".
 # Krav från RIPE.
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "konflikt i tidsstämpel"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "oanvändbar algoritm för publika nycklar"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "filen finns"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "svag nyckel"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "ogiltigt argument"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "felaktig uri"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "uri:n stöds inte"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "nätverksfel"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "inte krypterad"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "inte behandlad"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "oanvändbar publik nyckel"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "oanvändbar hemlig nyckel"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "nyckelserverfel"
 
-#: util/errors.c:109
+#: util/errors.c:107
 msgid "canceled"
 msgstr "avbruten"
 
-#: util/errors.c:110
+#: util/errors.c:108
 msgid "no card"
 msgstr "inget kort"
 
-#: util/errors.c:111
+#: util/errors.c:109
 msgid "no data"
 msgstr "inget data"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr "FEL: "
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr "VARNING: "
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... det här är ett fel (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "nej"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "avsluta"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "aA"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr "okay|okej|ok"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr "avbryt|stoppa"
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 msgid "cC"
 msgstr "aAsS"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "VARNING: använder osäkert minne!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "se http://www.gnupg.org/faq.html för mer information\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "åtgärden är inte möjlig utan initierat säkert minne\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kanske använder fel program för den här uppgiften)\n"
+
+# notation data?
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "kan inte lägga till notationer i signaturer gjorda med en v3-nyckel\n"
+#~ "(PGP 2.x-typ)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "kan inte lägga till notationer i nyckelsignaturer signaturer gjorda med "
+#~ "en v3-nyckel (PGP 2.x-typ)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "kan inte ange en policy-URL i v3 (PGP 2.x style) signaturer\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "kan inte lägga till en policy-URL i signaturer gjorda med en v3-nyckel "
+#~ "(PGP 2.x-typ)\n"
diff --git a/po/tr.po b/po/tr.po
index 17cd991bd..b3959f9be 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+0200\n"
 "PO-Revision-Date: 2005-03-16 07:30+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -15,90 +15,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "pbits=%u qbits=%u ile bir asal sayı üretilemez\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "%d bitten daha küçük bir asal sayı ürtilemez\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "rasgele bayt elde etme modülü bulunamadı\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "`%s' kiltlenemedi\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "`%s' durumlanamıyor: %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' düzenli bir dosya değil - görülmedi\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "not: \"random_seed\" dosyası boş\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "UYARI: random_seed dosyasının boyu hatalı - kullanılmadı\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "\"%s\" okunamıyor: %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "\"%s\" yazılamıyor: %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "\"%s\" kapatılamıyor: %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "UYARI: kullanılan rasgele sayı üreteci güvenli değil!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -112,7 +112,7 @@ msgstr ""
 "BU PROGRAMLA ÜRETİLMİŞ HİÇBİR VERİYİ KULLANMAYIN!!\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -121,7 +121,7 @@ msgstr ""
 "Lütfen bekleyin rasgele baytlar toplanıyor. Bu işlem sırasında başka\n"
 "işlere bakın, çünkü bu anahtarınızın daha kaliteli olmasını sağlayacak.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -133,62 +133,62 @@ msgstr ""
 "daha fazla rasgele bayt toplayabilmesi için işletim sistemine\n"
 "yardımcı olun! (%d bayt daha gerekiyor)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "parmakizinin saklanması başarısız oldu: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "anahtar okuması başarısız\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr "yanıt genel anahtar verisi içermiyor\n"
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr "yanıt RSA modülü içermiyor\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN eylemcisi hata döndürdü: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr "karttan CHV durumu alınırken hata\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr "kart kalıcı olarak kilitli!\n"
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -197,344 +197,349 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr "|A|Yönetici PIN'i"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Yeni Yönetici PIN'i"
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr "|N|Yeni PIN"
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 msgid "error reading application data\n"
 msgstr "uygulama verisi okunurken hata\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 msgid "error reading fingerprint DO\n"
 msgstr "parmakizi DO okunurken hata\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 msgid "key already exists\n"
 msgstr "anahtar zaten mevcut\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr "mevcut anahtar konulacak\n"
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 msgid "generating new key\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "genel üs çok büyük (32 bitten fazla)\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 msgid "generating key failed\n"
 msgstr "anahtar üretimi başarısızlığa uğradı\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "anahtar üretimi tamamlandı (%d saniye)\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, fuzzy, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [yapılan imza: %lu]"
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "zırh: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "zırh başlığı geçersiz: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "zırh başlığı: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "açıkça okunabilen imza başlığı geçersiz\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "zırh başlığı: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "açıkça okunabilen imzalar dahil edildi\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 msgid "unexpected armor: "
 msgstr "beklenmeyen zırh: "
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "araçizgisi escape'lı satır geçersiz: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "geçersiz radix64 karakteri %02X atlandı\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "dosya sonu belirsiz (CRC yok)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "dosya sonu belirsiz (CRC içinde)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "CRC bozulmuş\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC hatası; %06lX - %06lX\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 msgid "premature eof (in trailer)\n"
 msgstr "dosya sonu belirsiz (kuyruk içinde)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "kuyruk satırında hata\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "geçerli OpenPGP verisi yok\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "geçersiz zırh: satır %d karakterden uzun\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "zırh içinde uluslararası karakterler - büyük olasılıkla hatalı bir e-posta "
 "sunucusu kullanılmış\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "%s numaralı OpenPGP kartı saptandı\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "bu önceden betik kipinde yapılamaz\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr "[belirtilmedi]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 msgid "male"
 msgstr "erkek"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "female"
 msgstr "dişi"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "unspecified"
 msgstr "belirtilmemiş"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "not forced"
 msgstr "zorlanmadı"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr "zorlandı"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Hata: Şimdilik sadece US-ASCII mümkün.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Hata: \"<\" karakteri kullanılmamalı.\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Hata: Çift boşluğa izin verilmez.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr "Kart sahibinin soyadı: "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr "Kart sahibinin adı: "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Hata: İsimler birlikte çok uzun oluyor (sınır: %d karakter).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 msgid "URL to retrieve public key: "
 msgstr "genel anahtarın alınacağı URL: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr "Oturum açma verisi (hesap adı): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Hata: Oturum açma verisi çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr "Özel DO verisi: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Hata: Özel DO çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 msgid "Language preferences: "
 msgstr "Dil tercihleri: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 msgid "Error: invalid length of preference string.\n"
 msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Cinsiyet ((E)rkek, (D)işi veya boşluk): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 msgid "Error: invalid response.\n"
 msgstr "Hata: yanıt geçersiz.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 msgid "CA fingerprint: "
 msgstr "CA parmak izi: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hata: biçimli parmakizi geçersiz\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "anahtar işlemi mümkün değil: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 msgid "not an OpenPGP card"
 msgstr "bir OpenPGP kartı değil"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr "Mevcut anahtar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Şifreli anahtarın kartsız yedeği yapılsın mı? (E/h ya da Y/n) "
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr "Mevcut anahtarlar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -545,139 +550,139 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 msgid "Please select the type of key to generate:\n"
 msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 msgid "   (1) Signature key\n"
 msgstr "   (1) İmzalama anahtarı\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 msgid "Please select where to store the key:\n"
 msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 msgid "unknown key protection algorithm\n"
 msgstr "bilinmeyen anahtar koruma algoritması\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 msgid "secret parts of key are not available\n"
 msgstr "anahtarın gizli parçaları kullanılabilir değil\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 msgid "secret key already stored on a card\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "show admin commands"
 msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "bunu gösterir"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "list all available data"
 msgstr "tüm kullanılabilir veriyi listeler"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr "kart sahibinin ismini değiştirir"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr "anahtarın alınacağı URL değiştirilir"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr "kart URL'sinde belirtilmiş anahtarı alır"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change the login name"
 msgstr "oturum açma ismini değiştirir"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "change the language preferences"
 msgstr "dil tercihlerini değiştirir"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr "kart sahibinin cinsiyetini değiştirir"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "change a CA fingerprint"
 msgstr "bir CA parmakizini değiştirir"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr "imza zorlama PIN'i bayrağını değiştirir"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 msgid "generate new keys"
 msgstr "yeni anahtarlar üretir"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr "PIN değiştirmek için menü"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 msgid "Admin-only command\n"
 msgstr "Yöneticiye özel komut\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 msgid "Admin commands are allowed\n"
 msgstr "Yönetici komutlarına izin verilir\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 msgid "Admin commands are not allowed\n"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "gizli anahtar kullanışsız"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 "Lüthen kartı yerleştirdikten sonra ya <enter> ya da iptal için 'c' tuşlayın: "
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "anahtar bloğu silinemedi: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -687,131 +692,131 @@ msgstr ""
 "   %.*s\n"
 "olan kartı yerleştirin.\n"
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Hazır olunca <enter> ya da iptal etmek için 'c' tuşlayın: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr "Yeni Yönetici PIN'ini girin: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr "Yeni PIN'i girin: "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr "Yönetici PIN'ini girin: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr "PIN'i girin: "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 msgid "Repeat this PIN: "
 msgstr "Bu PIN'i tekrarlayın: "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "anahtar bloğu okunurken hata: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(anahtarı parmak izi ile belirtmedikçe)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "betik kipinde \"--yes\" olmaksızın bu yapılamaz\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Bu anahtar, anahtar zincirinden silinsin mi? (e/H ya da y/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Bu bir gizli anahtar! - gerçekten silinecek mi? (e/H veya y/N)"
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "anahtar bloğu silinemedi: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "sahibinin güvencesi bilgisi temizlendi\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K kipi sayesinde bir simetrik ESK paketi kullanılamıyor\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "%s şifrelemesi kullanılıyor\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece 2048 bitlik RSA anahtarları ile şifreleme "
 "yapabilirsiniz\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "`%s'den okunuyor\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "tüm anahtarları şifrelemek için IDEA şifresi kullanılamaz.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -819,7 +824,7 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
 "zorlanıyor\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -828,166 +833,166 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) sıkıştırma algoritması "
 "kullanılmak isteniyor\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s \"%s\" için şifrelendi\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s şifreli veri\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "UYARI: ileti simetrik şifre içindeki zayıf bir anahtarla şifrelendi.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "şifreli paketin elde edilmesinde sorun var\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "uzaktan uygulama çalıştırılması desteklenmiyor\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "güvensiz options dosyası yetkilerinden dolayı dış program çağrıları iptal\n"
 "edildi\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "bu platformda, dış uygulamalar çalıştırılırken geçici dosyalar gerekiyor\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr " '%s' çalıştırılamıyor: %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "'%s' kabuğu çalıştırılamıyor: %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "dış uygulama çalıştırılırken sistem hatası: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "Dış uygulamamnın doğal olmayan çıkışı\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "dış uygulama çalıştırılamıyor\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "dış uygulamanın yanıtı okunamıyor: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "UYARI: geçici dosya silinemiyor (%s) `%s': %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "UYARI: %s geçici dizini silinemiyor: %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "\"%s\" için yürürlükten kaldırma anahtarları yok\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "gizli anahtar kullanımdışı"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 msgid "exporting secret keys not allowed\n"
 msgstr "gizli anahtarların ihracına izin verilmez\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "anahtar %s: korunmamış - atlandı\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "anahtar %s: PGP 2.x tarzı bir anahtar - atlandı\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "UYARI: gizli anahtar %s basit bir SK sağlamasına sahip değil\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -995,127 +1000,127 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr "kart durumunu basar"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr "kart üzerindeki veriyi değiştirir"
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr "bir kartın PIN'ini değiştirir"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1125,51 +1130,51 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "imzalamak ya da şifre çözmek için bu kullanıcı kimliği kullanılır"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yapılmaz)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "çok detaylı"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sorar"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr "kesin OpenPGP davranışı etkin olur"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x uyumlu iletiler üretilir"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1177,7 +1182,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1197,17 +1202,17 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Yazılım hatalarını lütfen <[email protected]> adresine,\n"
 "çeviri hatalarını ise <[email protected]> adresine bildiriniz.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1217,7 +1222,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1225,632 +1230,632 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grup tanımı '%s' içinde = işareti yok\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "listedeki bir anahtarın hangi anahtar zincirinde olduğunu gösterir"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "şifre eklentisi '%s' güvensiz izinlerden dolayı yüklenmedi\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipindeyken sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' özümleme algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' sıkıştırma algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s kipindeyken  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk belleğinde çok fazla girdi - iptal edildi\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 msgid "[User ID not found]"
 msgstr "[Kullanıcı kimliği yok]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "yardımcı genel anahtar %s için gizli yardımcı anahtar yok - yoksayılıyor\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "daha az detaylı"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "anahtarlar bu anahtarlıktan alınır"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1858,7 +1863,7 @@ msgstr ""
 "Kullanımı: gpg [seçenekler] [dosyalar]\n"
 "Bilinen güvenli anahtarlara göre imzaları kontrol eder\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1869,7 +1874,7 @@ msgstr ""
 "bunun (açıkça belirtilmeden oluşturulmuş) sertifikalar ağıyla\n"
 "hiçbir alakası yok."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1882,18 +1887,18 @@ msgstr ""
 "bildirilmesi gerekir. \"evet\" yanıtı bu anahtarın son derece güvenli\n"
 "olduğunun belirtilmesi için yeterlidir.\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Bu güvencesiz anahtarı yine de kullanmak istiyorsanız cevap olarak\n"
 " \"evet\" yazın."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Bu iletiyi göndereceğiniz adresin kullanıcı kimliğini giriniz."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1917,7 +1922,7 @@ msgstr ""
 "\n"
 "İlk (asıl) anahtar daima imzalama yeteneğine sahip bir anahtar olmalıdır."
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1927,16 +1932,16 @@ msgstr ""
 "değildir. Bu algoritma sadece belli alanlarda kullanılabilir.\n"
 "Lütfen güvenlik uzmanınıza danışın."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "Anahtar uzunluğunu giriniz"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "Cevap \"evet\" ya da \"hayır\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1947,20 +1952,20 @@ msgstr ""
 "iyi bir hata cevabı alamazsınız -- onun yerine sistem verilen değeri\n"
 "bir zaman aralığı olarak çözümlemeyi dener."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "Anahtar tutucunun ismini giriniz"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 "lütfen bir E-posta adresi girin (isteğe bağlı ancak kuvvetle tavsiye edilir)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "Lütfen önbilgi girin (isteğe bağlı)"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1974,11 +1979,11 @@ msgstr ""
 "D anahtar üretimine Devam etmek için.\n"
 "K anahtar üretiminden çıKmak için."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Yardımcı anahtarı üretmek istiyorsanız \"evet\" ya da \"e\" girin."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2040,13 +2045,13 @@ msgstr ""
 "kontroller arasındaki ayrıma siz karar vereceksiniz.\n"
 "Bu kararı verebilecek durumda değilseniz \"0\" cevabını verin."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 "Kullanıcı kimliklerinin TÜMünü imzalamak istiyorsanız \"evet\" ya da \"yes\" "
 "yazın"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2054,11 +2059,11 @@ msgstr ""
 "Bu kullanıcı kimliğini gerçekten silmek istiyorsanız \"evet\" girin.\n"
 "Böylece bütün sertifikaları kaybedeceksiniz!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Bu yardımcı anahtarı silme izni vermek istiyorsanız \"evet\" girin"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2068,7 +2073,7 @@ msgstr ""
 "sertifikalanmış bir diğer anahtara bir güvence bağlantısı sağlamakta\n"
 "önemli olabileceğinden normalde bu imzayı silmek istemezsiniz."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2080,13 +2085,13 @@ msgstr ""
 "ertelemelisiniz çünkü bu imzalama anahtarı başka bir sertifikalı\n"
 "anahtar vasıtası ile bir güvence bağlantısı sağlayabilir."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "İmza geçersiz. Onu anahtar zincirinizden kaldırmak uygun olacak."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2099,7 +2104,7 @@ msgstr ""
 "Bunu sadece, eğer bu öz-imza bazı durumlarda geçerli değilse ya da\n"
 "kullanılabilir bir ikincisi var ise yapın."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2109,23 +2114,23 @@ msgstr ""
 "listesine çevirir. Tüm etkilenen öz-imzaların zaman damgaları bir sonraki\n"
 "tarafından öne alınacaktır.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Lütfen bir anahtar parolası giriniz; yazdıklarınız görünmeyecek\n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Lütfen son parolayı tekrarlayarak ne yazdığınızdan emin olun."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "İmzanın uygulanacağı dosyanın ismini verin"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Dosyanın üzerine yazılacaksa lütfen \"evet\" yazın"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2133,7 +2138,7 @@ msgstr ""
 "Lütfen yeni dosya ismini girin. Dosya ismini yazmadan RETURN tuşlarsanız\n"
 "parantez içinde gösterilen öntanımlı dosya kullanılacak."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2161,7 +2166,7 @@ msgstr ""
 "\tKullanıcı kimliği artık kullanılamayacak durumdaysa bunu\n"
 "\tseçin; genelde Eposta adresi geçersiz olduğunda kullanılır.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2171,542 +2176,542 @@ msgstr ""
 "verdiğinizi açıklayan bir metin girebilirsiniz.\n"
 "Lütfen bu metin kısa olsun. Bir boş satır metni bitirir.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "yardım mevcut değil"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "\"%s\" için yardım mevcut değil"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "güvence veritabanını günceller"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "genel anahtar gizli anahtarla uyuşmuyor!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "gizli anahtar kullanımdışı"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d. tür blok atlandı\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "şu ana kadar %lu anahtar işlendi\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "İşlenmiş toplam miktar: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "     yeni anahtarlar atlandı: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         kullanıcı kimliksiz: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      alınan: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   değişmedi: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      yeni kullanıcı kimliği: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "    yeni yardımcı anahtarlar: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                yeni imzalar: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      yeni anahtar iptalleri: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     gizli anahtarlar okundu: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  gizli anahtarlar indirildi: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  gizli anahtarlar değişmedi: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             alınamadı: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     gizli anahtarlar okundu: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, fuzzy, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "UYARI: anahtar %s kullanılabilir olmayan tercihler içeriyor\n"
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "Bu kullanıcı kimlikler için algoritmalar:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": şifreleme algoritması %s için tercih edilir\n"
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": özümleme algoritması %s için tercih edilir\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 "         \"%s\": sıkıştırma algoritması %s için tercih edilir\n"
 "\n"
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "tercihlerinizi güncellemenizi ve\n"
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "olası algoritma uyuşmazlığı sorunlarından kaçınmak için bu anahtarı\n"
 "tekrar dağıtmanızı şiddetle öneririz.\n"
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "anahtar %s: öz-imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "anahtar %s: genel anahtar yok: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "anahtar %s: yeni anahtar - atlandı\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtar zincirine yazarken hata oluştu: %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "anahtar %s: \"%s\" 1 yeni kullanıcı kimliği\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "anahtar %s: \"%s\" değişmedi\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "gizli anahtarı alımına izin verilmez\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "anahtar %s: gizli anahtar alındı\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "anahtar %s: zaten gizli anahtar zincirinde\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "anahtar %s: gizli anahtar yok: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "anahtar %s: genel anahtar değil - yürürlükten kaldırma sertifikası "
 "uygulanamaz\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "anahtar %s: imza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "anahtar %s: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
 "desteklenmiyor\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "anahtar %s: çok sayıda yardımcı anahtar bağlantısı silindi\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "anahtar %s: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "anahtar %s: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 "anahtar %s: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "anahtar %s: yardımcı anahtar atlandı\n"
 
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "anahtar %s: imza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
 "anahtarı %s alınıyor\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
 "anahtarı %s mevcut değil.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "BİLGİ: bir anahtarın seri numarası kartlardan biriyle uyuşmuyor\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "BİLGİ: asıl anahtar kart üzerinde saklı ve kullanılabilir\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "BİLGİ: ikincil anahtar kart üzerinde saklı ve kullanılabilir\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "`%s' anahtar zinciri oluşturulurken hata: %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "`%s' anahtar zinciri oluşturuldu\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "`%s' oluşturulurken hata: %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "anahtar zinciri belleği yeniden oluşturulurken hata: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[yürürlükten kaldırma]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[öz-imza]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 kötü imza\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d kötü imza\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "1 imza bir hata yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d imza hatalardan dolayı kontrol edilmedi\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2717,17 +2722,17 @@ msgstr ""
 "derecesine lütfen karar verin. (pasportuna mı bakarsınız yoksa farklı\n"
 "kaynaklardan parmakizlerini mi kontrol edersiniz...) kararınızı verin\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Şöyle böyle güveniyorum\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Tamamen güveniyorum\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2737,46 +2742,46 @@ msgstr ""
 "1'den büyük bir derinlik, imzaladığınız anhatarın kendi yararınıza\n"
 "güvence imzaları yapmayı mümkün kılar.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Bu imzayı kısıtlayacak bir etki alanı girin, yoksa <enter> tuşlayın.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2785,11 +2790,11 @@ msgstr ""
 "\"%s\" üzerindeki öz-imza\n"
 "bir PGP 2.x tarzı imza.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Bir OpenPGP öz-imzası haline getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2798,12 +2803,12 @@ msgstr ""
 "\"%s\" üzerindeki imzanızın\n"
 "kullanım süresi dolmuş.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Yeni imzanızın süresi dolmuş biriyle değiştirilmesini ister misiniz? (e/H) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2812,44 +2817,44 @@ msgstr ""
 "\"%s\" üzerindeki imzanız\n"
 "dahili bir imza.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" zaten %s anahtarıyla yerel olarak imzalanmış\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" zaten %s anahtarıyla imzalanmış\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "İmzanızın da bu kadar süre geçerli olmasını ister misiniz? (E/h) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2857,11 +2862,11 @@ msgstr ""
 "--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzası "
 "uygulanamayabilir.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Bu, anahtarı PGP 2.x için kullanışsız yapacak.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2870,31 +2875,31 @@ msgstr ""
 "Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
 "doğruladınız?  Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Cevabı bilmiyorum. %s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Tamamen kontrol edildi.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) İlişkisel denetim yaptım.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Çok dikkatli bir denetim yaptım.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Seçiminiz? (daha fazla bilgi için: '?'): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2904,76 +2909,76 @@ msgstr ""
 "gerçekten\n"
 "emin misiniz?\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 msgid "This will be a self-signature.\n"
 msgstr "Bu bir öz-imza olacak.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "İmza dışarı gönderilemez olarak imlenecek.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "I have not checked this key at all.\n"
 msgstr "Her şeyiyle bu anahtarı sınayamadım.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 msgid "I have checked this key casually.\n"
 msgstr "Bu anahtarı karşılaştırmalı olarak sınadım.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 msgid "I have checked this key very carefully.\n"
 msgstr "Bu anahtarı çok dikkatle sınadım.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
 "değiştirilecek bir anahtar parolası yok.\n"
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2981,13 +2986,13 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
 "tekrarlanacak"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2995,192 +3000,192 @@ msgstr ""
 "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 msgid "Do you really want to do this? (y/N) "
 msgstr "Gerçekten bunu yapmak istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "parmakizini gösterir"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "anahtarı ve kullanıcı kimliğini gösterir"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "N yardımcı anahtarını"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "imzaları sınar"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "seçilen kullanıcı kimliği imzalar [* ilgili komutlar için aşağıya bakın]"
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs locally"
 msgstr "kullanıcı kimlikleri yerel olarak imzalar"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a trust signature"
 msgstr "seçili kullanıcı kimlikleri bir güvence imzasıyla imzalar"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "seçili kullanıcı kimlikleri yürürlükten kaldırılamayan bir imzayla imzalar"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "bir foto kimliği ekler"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 msgid "delete selected user IDs"
 msgstr "seçili kullanıcı kimlikleri siler"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "add a subkey"
 msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr "bir akıllı karta bir anahtar ekler"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr "bir akıllı karttan bir anahtarı taşır"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr "bir akıllı karttan bir yedekleme anahtarını taşır"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 msgid "delete selected subkeys"
 msgstr "seçili yardımcı anahtarları siler"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "bir yürürlükten kaldırma anahtarı ekler"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 msgid "delete signatures from the selected user IDs"
 msgstr "seçili kullanıcı kimliklerden imzaları siler"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 "anahtar için ya da seçili yardımcı anahtarlar için zamanaşımı tarihini "
 "değiştirir"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 msgid "flag the selected user ID as primary"
 msgstr "seçili kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 msgid "toggle between the secret and public key listings"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "set preference list for the selected user IDs"
 msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "Seçili kullanıcı kimlikler için tercih edilen anahtar sunucu adresini "
 "belirler"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 msgid "revoke signatures on the selected user IDs"
 msgstr "Seçili tüm kullanıcı kimliklerdeki imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 msgid "revoke selected user IDs"
 msgstr "Seçili tüm kullanıcı kimlikleri yürürlükten kaldırır"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "revoke key or selected subkeys"
 msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 msgid "enable key"
 msgstr "anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 msgid "disable key"
 msgstr "anahtarı iptal eder"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 msgid "show selected photo IDs"
 msgstr "seçili foto kimlikleri gösterir"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "gizli anahtar bloğu \"%s\" okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3192,240 +3197,240 @@ msgstr ""
 "  için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı   olarak "
 "(ltsign, tnrsign gibi).\n"
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "imza türü `%s' bilinmiyor\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 "Seçilen tüm kullanıcı kimlikler gerçekten silinecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 msgid "Really remove this user ID? (y/N) "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 msgid "Really move the primary key? (y/N) "
 msgstr "Bu öz-imza gerçekten taşınacak mı?  (e/H ya da y/N) "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 msgid "You must select exactly one key.\n"
 msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr "Komut argüman olarak bir dosya ismi gerektiriyor\n"
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "yedekleme anahtarı `%s' den okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Seçilen tüm kullanıcı kimlikleri gerçekten yürülükten kaldırılacak mı? (e/H "
 "ya da y/N) "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 msgid "Really revoke this user ID? (y/N) "
 msgstr ""
 "Bu kullanıcı kimliği gerçekten yürürlükten kaldırılacak mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr ""
 "Anahtarın tamamını yürürlükten kaldırmayı gerçekten istiyor musunuz? (e/H ya "
 "da y/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 "Seçili yardımcı anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
 "(e/H ya da y/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr ""
 "Bu yardımcı anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? (e/H "
 "ya da y/N) "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Kullanıcı taraından sağlanmış bir güvence veritabanı kullanılarak "
 "sahibiningüvencesi belirlenemez\n"
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 msgid "Set preference list to:\n"
 msgstr "Belirlenecek tercih listesi:\n"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Seçili kullanıcı kimlikler için tercihleri gerçekten güncellemek istiyor "
 "musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 msgid "Really update the preferences? (y/N) "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 msgid "Save changes? (y/N) "
 msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 msgid "Quit without saving? (y/N) "
 msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "Özümlenen: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr "Anahtar sunucusu değişmez"
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr "Niteleme: "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Bir PGP 2.x tarzı kullanıcı kimliğine uygun tercih yok.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 "Bu anahtar %2$s tarafından %3$s anahtarıyla %1$s üzerinde yürürlükten "
 "kaldırılmış\n"
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Bu anahtar %s tarafından %s anahtarıyla yürürlükten kaldırılmış olabilir"
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, c-format
 msgid "created: %s"
 msgstr "oluşturuldu: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, c-format
 msgid "usage: %s"
 msgstr "kullanımı: %s"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, c-format
 msgid "trust: %s"
 msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr "kart-no: "
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3433,17 +3438,17 @@ msgstr ""
 "Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, gerekli\n"
 "doğrulukta olmayacağını lütfen gözönüne alınız.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3452,7 +3457,7 @@ msgstr ""
 "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
 "       kabul edilmesini sağlayabilirsiniz.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3461,75 +3466,75 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 #, fuzzy
 msgid "invalid"
 msgstr "geçersiz zırh"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3539,372 +3544,372 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı "
 "ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 "Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
 "olarak atanamaz\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
 "kullanamazsınız\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar başka amaçla\n"
 "       kullanılamaz!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "bir anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 msgid "Please select at most one subkey.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "UYARI: yardımcı imzalama anahtarı %s çapraz sertifikalı değil\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Onu değiştirmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Onu silmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "imza niteleyici: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Üzerine yazılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H) "
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Bu kullanıcı kimliklerini %s anahtarı üzerinde imzalamışsınız:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 msgid " (non-revocable)"
 msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 "Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "UYARI: bir kullanıcı kimliği imzası %d saniye gelecekte oluşturuldu\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Anahtar 0x%3$s (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği "
 "gösteriliyor\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "'%s' tercihi yinelendi\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "çok fazla şifreleme tercihi\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "çok fazla özümleme tercihi\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "çok fazla sıkıştırma tercihi\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "tercih dizgesindeki '%s' öğesi geçersiz\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "doğrudan imza yazılıyor\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "öz-imza yazılıyor\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 msgid "Sign"
 msgstr "İmzalama"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 msgid "Encrypt"
 msgstr "Şifreleme"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr "Kimlik kanıtlama"
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr "İiŞşKkçÇ"
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "bir %s anahtarı için olası eylemler: "
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr "Şimdilik mümkün eylemler: "
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) İmzalama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Şifreleme yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Bitti\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA anahtar çifti %u bit olacak.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "İstenen anahtar uzunluğu: %u bit\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3920,7 +3925,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3936,38 +3941,38 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "İmza ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 msgid "Key does not expire at all\n"
 msgstr "Anahtar hep geçerli olacak\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 msgid "Signature does not expire at all\n"
 msgstr "İmza hep geçerli olacak\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Anahtarın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "İmzanın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3975,11 +3980,11 @@ msgstr ""
 "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
 "Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 msgid "Is this correct? (y/N) "
 msgstr "Bu doğru mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3995,44 +4000,44 @@ msgstr ""
 "\t\"Fatih Sultan Mehmed (Padisah) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4043,7 +4048,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
@@ -4059,24 +4064,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4084,12 +4089,12 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4101,7 +4106,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4114,50 +4119,50 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gizli anahtar koçanı `%s'e yazılıyor\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "`%s' genel anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "`%s' gixli anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4165,19 +4170,19 @@ msgstr ""
 "Bu anahtar şifreleme için kullanılamaz. Şifreleme için yardımcı anahtarı\n"
 "\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4185,686 +4190,686 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 msgid "Really create? (y/N) "
 msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "anahtarın kart üzerinde saklanması başarısız: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "asla    "
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "Kritik imza guvencesi: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "imza guvencesi: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "Kritik tercihli anahtar sunucusu: "
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "Kritik imza niteleyici: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "imza niteleyici: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "Anahtar Zinciri"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 msgid "      Key fingerprint ="
 msgstr "     Anahtar parmakizi ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr "      Kart seri no. ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "UYARI: gizli bilgi içeren 2 dosya mevcut.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s değişmeyenlerden\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s yenilerden\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "Lütfen bu güvenlik çatlağını giderin\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "%s' anahtar zinciri arabellekleniyor\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "şimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu anahtar arabelleklendi (%lu imza)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anahtar zinciri oluşturuldu\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "UYARI: anahtar sunucusu seçeneği `%s' bu platformda kullanımda değil\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 msgid "disabled"
 msgstr "iptal edildi"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 msgid "key not found on keyserver\n"
 msgstr "anahtar, anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "%s anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "%s anahtarı %s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 msgid "no keyserver action!\n"
 msgstr "bir anahtar sunucusu eylemi yok!\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "UYARI: GnuPG'nin başka bir sürümünün anahtar sunucusu eylemcisi (%s)\n"
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr "anahtar sunucusu VERSION göndermiyor\n"
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "harici anahtar sunucusu çağrıları bu kurulumda desteklenmiyor\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "`%s' anahtar sunucusu şeması için eylemci yok\n"
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "`%s' eylemi `%s' anahtar sunucusu şeması ile desteklenmiyor\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s  %d sürümü eylemciyi desteklemiyor\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 msgid "keyserver timed out\n"
 msgstr "anahtar sunucusu zamanaşımına uğradı\n"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 msgid "keyserver internal error\n"
 msgstr "anahtar sunucusu iç hatası\n"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "anahtar sunucusuyla iletişim hatası: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, 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:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s şifreli oturum anahtarı\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, 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:381
+#: g10/mainproc.c:385
 #, c-format
 msgid "public key is %s\n"
 msgstr "genel anahtar: %s\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtarla şifreli veri: doğru DEK\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, 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:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, 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:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, 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:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "UYARI: ileti bütünlük korumalı değildi\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 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:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 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:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "imza doğrulama engellendi\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "bu çoklu imzalar elde edilemiyor\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, c-format
 msgid "Signature made %s\n"
 msgstr "İmza %s de\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s kullanılarak anahtar %s ile yapılmış\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, 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:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "Anahtar burada:"
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" deki imza KÖTÜ"
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\" deki imza zamanaşımına uğramış"
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "ikili"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "İmza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
 
-#: g10/mainproc.c:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "`%s' için %s de durum bilgisi alınamıyor: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) %s de başarısız: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "UYARI: deneysel %s genel anahtar algoritması kullanılıyor\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "UYARI: deneysel %s şifreleme algoritması kullanılıyor\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "UYARI: deneysel %s özümleme algoritması kullanılıyor\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "UYARI: %s özümleme algoritması artık önerilmiyor.\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA şifre eklentisi yok\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " b = Daha fazla bilgi gerekli\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "lütfen yerine \"%s%s\" kullanınız\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "Sıkıştırılmamış"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 msgid "uncompressed|none"
 msgstr "Sıkıştırılmamış|yok"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "bu ileti %s tarafından kullanılamayabilir\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "`%s' seçeneği belirsiz\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "\"%s\" dosyası var. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 msgid "Overwrite? (y/N) "
 msgstr "Üzerine yazılsın mı? (e/H ya da y/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: bilinmeyen sonek\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "Yeni dosya ismini giriniz"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "standart çıktıya yazıyor\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "\"%s\" içindeki veri imzalı kabul ediliyor\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "yeni yapılandırma dosyası `%s' oluşturuldu\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "UYARI: `%s' deki seçenekler bu çalıştırma sırasında henüz etkin değil\n"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "dizin `%s' oluşturuldu\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (asıl anahtar kimliği %s)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4875,27 +4880,27 @@ msgstr ""
 "kullanıcısının gizli anahtarını açacak bir anahtar parolasına ihtiyaç var.\n"
 "%u bitlik %s anahtarı, kimlik %s, oluşturma tarihi %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "Parolayı tekrar yazınız\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "Anahtar parolasını giriniz\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "kullanıcı tarafından durduruldu\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr "betik kipinde parola sorgulanamaz\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "Anahtar parolasını girin: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4904,21 +4909,21 @@ msgstr ""
 "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
 "Anahtarın sahibi: \"%s\"\n"
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bitlik %s anahtarı, %s kimliği ile %s tarihinde üretilmiş"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "Tekrar: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4932,116 +4937,116 @@ msgstr ""
 "bir resim kullanırsanız genel anahtarınız da çok büyük olacaktır. Resim\n"
 "boyutlarının 240x288 civarında seçilmesi uygun olacaktır.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Foto kimliği için JPEG dosya ismini giriniz: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "JPEG dosyası `%s' açılamıyor: %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Bu JPEG gerçekten büyük (%d bayt)!\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H ya da y/N)  "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "'%s' bir JPEG dosyası değil\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Bu foto doğru mu? (e/H/ç)? "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "foto kimliği gösterilemiyor!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "Belirtilmiş bir neden yok"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "Anahtarın yerine başkası konulmuş ve iptal edilmiştir"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "Anahtar tehlikede"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "Anahtar artık kullanılmayacak"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "Kullanıcı kimliği artık geçersiz"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "yürürlükten kaldırma sebebi: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "yürürlükten kaldırma açıklaması: "
 
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "bBmMaAkK"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 msgid "No trust value assigned to:\n"
 msgstr "Güven değeri belirtilmemiş:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  namı-diğer \"%s\"\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
 "%s: Bu anahtarın gerçekten sahibine ait olduğuna dair bir belirti yok\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = bilmiyorum, kem küm\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = güvence vermem\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = Son derece güveniyorum\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 msgid "  m = back to the main menu\n"
 msgstr " m = ana menüye dön\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  s = skip this key\n"
 msgstr " a = bu anahtarı atla\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  q = quit\n"
 msgstr " ç = çık\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5050,43 +5055,43 @@ msgstr ""
 "Bu anahtar için asgari güvence seviyesi: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "Kararınız? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr ""
 "Bu anahtarı gerçekten son derece güvenli yapmak istiyor musunuz?  (e/H ya da "
 "y/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Son derece güvenli bir anahtarla sonuçlanan sertifikalar:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Bu anahtarın gerçekten ismi belirtilen şahsa ait olduğuna dair bir "
 "belirti yok\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
 "%s: Bu anahtarın gerçekten ismi belirtilen şahsa ait olduğuna dair sınırlı "
 "bir belirti var\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 msgid "This key probably belongs to the named user\n"
 msgstr "Bu anahtarın ismi belirtilen şahsa ait olduğu umuluyor\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "Bu anahtar bizim\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5096,110 +5101,110 @@ msgstr ""
 "olduğu kesin DEĞİL. *Gerçekten* ne yaptığınızı biliyorsanız,\n"
 "sonraki soruya da evet cevabı verebilirsiniz.\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 msgid "Use this key anyway? (y/N) "
 msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "UYARI: Güven derecesiz anahtar kullanılıyor!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "UYARI: bu anahtar yürürlükten kaldırılmamış olabilir (yürürlükten kaldırma "
 "anahtarı mevcut değil)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "UYARI: Bu anahtar onu üreten tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Bu imza sahte anlamına gelebilir.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 "UYARI: Bu yardımcı anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "Bilgi: Bu anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "Bilgi: Bu anahtarın kullanım süresi dolmuştu!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Bu imzanın sahibine ait olduğuna dair bir belirti yok.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "UYARI: Bu anahtara güven-mi-yoruz!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Bu imza SAHTE olabilir.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "UYARI: Bu anahtar yeterli güven derecesine sahip imzalarla "
 "sertifikalanmamış!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Bu imzanın sahibine ait olduğu kesin değil.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: atlandı: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: atlandı: genel anahtar zaten var\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Bir kullanıcı kimliği belirtmediniz. (\"-r\" kullanabilirsiniz)\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr "Şimdiki alıcılar:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5207,170 +5212,170 @@ msgstr ""
 "\n"
 "Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "Böyle bir kullanıcı kimliği yok.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "atlandı: genel anahtar zaten öntanımlı alıcı olarak ayarlanmış\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "Genel anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "öntanımlı alıcı \"%s\" bilinmiyor\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: atlandı: genel anahtar iptal edildi\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "geçerli adresler yok\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "veri kaydedilmedi; kaydetmek için \"--output\" seçeneğini kullanın\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "`%s' oluşturulurken hata: %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "Bağımsız imza.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "Lütfen veri dosyasının ismini girin: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "standart girdiden okuyor ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "imzalı veri yok\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imzalı veri '%s'  açılamadı\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonim alıcı: %s gizli anahtarı deneniyor ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "tamam, biz anonim alıcıyız.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK'in eski kodlaması desteklenmiyor\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "şifre algoritması %d%s bilinmiyor ya da iptal edilmiş\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "UYARI: %s şifre algoritması alıcı tercihlerinde yok\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "BİLGİ: %s gizli anahtarının %s tarihinde kullanım süresi doldu\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "BİLGİ: anahtar yürürlükten kaldırılmıştı"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet başarısız: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "Yürürlükten kaldıran:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Bu bir duyarlı yürürlükten kaldırma anahtarı)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H ya "
 "da y/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII zırhlı çıktı istendi.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet başarısız: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "\"%s\" için yürürlükten kaldırma anahtarları yok\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "gizli anahtar \"%s\" yok: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "karşılığı olan genel anahtar yok: `%s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "genel anahtar gizli anahtarla uyuşmuyor!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr ""
 "Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H "
 "ya da y/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "bilinmeyen sıkıştırma algoritması\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "BİLGİ: Bu anahtar korunmamış!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5388,130 +5393,130 @@ msgstr ""
 "Sertifika kısa olacağından isterseniz, bir yazıcı çıktısı olarak alıp\n"
 "bir kasada da muhafaza edebilirsiniz.\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "İptal"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "İsteğe bağlı açıklamayı girebilirsiniz; Boş bir satır işlemi sonlandırır:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Yürürlükten kaldırma sebebi: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(açıklama verilmedi)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 msgid "Is this okay? (y/N) "
 msgstr "Bu tamam mı? (e/H ya da y/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "gizli anahtar parçaları kullanım dışı\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "koruma algoritması %d%s desteklenmiyor\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "koruma algoritması %d desteklenmiyor\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "Anahtar parolası geçersiz; lütfen tekrar deneyin"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "UYARI: Zayıf anahtar saptandı - lütfen anahtar parolasını tekrar "
 "değiştirin.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "gizli anahtarın güvenliği için eski tarz 16 bitlik sağlama toplamı "
 "üretiliyor\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "zayıf anahtar oluşturuldu - yeniden deneniyor\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "simetrik şifre için zayıf anahtarın önlenmesi mümkün olamadı: %d kere "
 "denendi!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "UYARI: iletideki imza özümlemesi çelişkili\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "UYARI: yardımcı imzalama anahtarı %s çapraz sertifikalı değil\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
 "UYARI: yardımcı imzalama anahtarı %s geçersiz çapraz sertifikalamaya sahip\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "genel anahtar %s imzadan %lu saniye daha yeni\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "genel anahtar %s imzadan %lu saniye daha yeni.\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %s %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
@@ -5519,54 +5524,38 @@ msgstr ""
 "anahtar %s bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "BİLGİ: %s imza anahtarının kullanım süresi %s sularında dolmuş\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "hatalı imzanın bilinmeyen bir kritik bitten dolayı %s anahtarından "
 "kaynaklandığı sanılıyor\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "anahtar %s: anahtarı yürürlükten kaldırma imzası için yardımcı anahtar yok\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "anahtar %s: yardımcı anahtarı garantileme imzası için yardımcı anahtar yok\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "niteleme verisi v3 (PGP 2.x tarzı) imzalara konulamaz\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "niteleme verisi v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "UYARI: %%-genişletmesi imkansız (çok büyük).\n"
 "Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "poliçe URL'si v3 (PGP 2.x tarzı) imzalara konulamaz\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "poliçe URL'si v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5574,7 +5563,7 @@ msgstr ""
 "UYARI: güvence adresi için %%lik uzatma imkansız (çok büyük).\n"
 "Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5583,22 +5572,22 @@ msgstr ""
 "UYARI: tercih edilen anahtar sunucu adresi için %%lik uzatma imkansız\n"
 "(çok büyük). Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s imza: \"%s\" den\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla ayrık imza yapabilirsiniz\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5606,49 +5595,49 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) özümleme algoritması "
 "kullanılmak isteniyor\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla açık imzalama "
 "yapabilirsiniz\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "anahtar güvenli olarak imlenmemiş - onu sahte RSÜ ile kullanmayın!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\" atlandı: tekrarlanmış\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\" atlandı: %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "atlandı: gizli anahtar zaten var\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "güvence veritabanının %lu. kaydı, %d türünde: yazma başarısız: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5657,332 +5646,332 @@ msgstr ""
 "# Atanan güvencedeğerlerinin listesi %s oluşturuldu\n"
 "# (Eski haline getirmek için \"gpg --import-ownertrust\" kullanın\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "'%s' de hata: %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "satır çok uzun"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr ": imi eksik"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "parmakizi geçersiz"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "sahibiningüvencesi değeri kayıp"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "`%s' deki güvence kaydını ararken hata: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "`%s' için okuma hatası: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "güvence veritabanı %lu kaydı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "güvence veritabanı %lu kaydı: yazma başarısız (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "güvence veritabanı işlemi çok uzun\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "'%s' erişilemiyor: %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dizin yok!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "`%s' için kilit oluşturulamıyor\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "`%s' kiltlenemedi\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: sürüm kaydı oluşturmada başarısız: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: geçersiz güvence veritabanı oluşturuldu\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: güvence veritabanı oluşturuldu\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "BİLGİ: güvence veritabanına yazılamıyor\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: güvence veritabanı geçersiz\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nitelemeli tablo oluşturulamadı: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: sürüm kaydının güncellenmesinde hata: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: sürüm kaydının okunmasında hata: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: sürüm kaydının yazılmasında hata: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "güvence veritabanı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "güvence veritabanı: okuma başarısız (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bir güvence veritabanı dosyası değil\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: %lu kayıt numarası ile sürüm kaydı\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: dosya sürümü %d geçersiz\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: serbest kaydı okuma hatası: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: dizin kaydını yazma hatası: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kayıt sıfırlama başarısız: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kayıt ekleme başarısız: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "güvence veritabanı bozulmuş; lütfen \"gpg --fix-trustdb\" çalıştırın.\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "%d karakterden daha uzun metin satırları okunamıyor\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "girdi satırı %d karakterden daha uzun\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' geçerli bir anahtar kimliği değil\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "anahtar %s: güvenli anahtar olarak kabul edildi\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "anahtar %s güvence veritabanında birden fazla görünüyor\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "anahtar %s: güvenli anahtar için genel anahtar yok - atlandı\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "anahtar %s son derece güvenli olarak imlendi.\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "güvence veritabanı kaydı %lu, istek tipi %d: okuma başarısız: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "güvence veritabanının %lu. kaydı %d istek türünde değil\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "bilinmeyen güvence modeli (%d) kullanılamıyor - %s güvence modeli "
 "varsayılıyor\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "%s güvence modeli kullanılıyor\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[yürürlükten kaldırıldı] "
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[süresi doldu] "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[bilinmeyen]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[tanımsız]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[şöyle böyle]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[tamamen]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[son derece]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "tanımsız"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "asla    "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "şöyle böyle"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "tamamen"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "son derece"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sonraki güvence veritabanı denetimi %s de\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "`%s' güvence modelli güvence veritabanı sınaması için gereksiz\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "`%s' güvence modelli güvence veritabanı güncellemesi için gereksiz\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "genel anahtar %s yok: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "lütfen bir --check-trustdb yapın\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d anahtar işlendi (%d doğrulama temizlendi)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "son derece güvenli bir anahtar yok\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "son derece güvenli %s için genel anahtar yok\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d şöyle böyle gerekli, %d tamamen gerekli, %s güvence modeli\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5990,13 +5979,13 @@ msgstr ""
 "derinlik: %d  geçerli: %3d  imzalı: %3d  güvenilir: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 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:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6011,308 +6000,320 @@ msgstr ""
 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"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "genel hata"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "bilinmeyen paket tipi"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "bilinmeyen sürüm"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "bilinmeyen genel anahtar algoritması"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "bilinmeyen özümleme algoritması"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "genel anahtar hatalı"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "gizli anahtar hatalı"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "imza hatalı"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "\"checksum\" hatası"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "anahtar parolası hatalı"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "genel anahtar bulunamadı"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "bilinmeyen şifre algoritması"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "anahtar zinciri açılamadı"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "geçersiz paket"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "geçersiz zırh"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "böyle bir kullanıcı kimliği yok"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "gizli anahtar kullanışsız"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "yanlış gizli anahtar kullanılmış"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "desteklenmiyor"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "anahtar hatalı"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "dosya okuma hatası"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "dosya yazma hatası"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "bilinmeyen sıkıştırma algoritması"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "dosya açma hatası"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "dosya oluşturma hatası"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "anahtar parolası geçersiz"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "tamamlanmamış genel anahtar algoritması"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "tamamlanmamış şifre algoritması"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "bilinmeyen imza sınıfı"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "güvence veritabanı hatası"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "MPI hatalı"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "iç kaynak sınırı"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "anahtar zinciri geçersiz"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "sertifika hatalı"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "kullanıcı kimliği bozuk"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "dosya kapama hatası"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "dosya isim değiştirme hatası"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "dosya silme hatası"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "beklenmeyen veri"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "zaman damgası çelişkili"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "genel anahtar algoritması kullanışsız"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "dosya mevcut"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "anahtar zayıf"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "geçersiz argüman"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "URI hatalı"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "desteklenmeyen URI"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "ağ hatası"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "şifrelenemedi"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "işlenemedi"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "genel anahtar kullanımdışı"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "gizli anahtar kullanımdışı"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "anahtar sunucusu hatası"
 
-#: util/errors.c:109
+#: util/errors.c:107
 msgid "canceled"
 msgstr "iptal edildi"
 
-#: util/errors.c:110
+#: util/errors.c:108
 msgid "no card"
 msgstr "kat yok"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "imzalı veri yok\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr "HATA: "
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr "UYARI: "
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... bu bir yazılım hatası (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "evet"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "eE"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "hayır"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "hH"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "çık"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "çÇ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr "tamam|tamam"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr "iptal|iptal"
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr "tT"
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 msgid "cC"
 msgstr "iİ"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "UYARI: kullanılan bellek güvenli değil!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 "Daha geniş bilgi edinmek için http://www.gnupg.org/faq.html adresine "
 "bakınız\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "güvenli bellek hazırlanmadan işlem yapmak mümkün değil\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "niteleme verisi v3 (PGP 2.x tarzı) imzalara konulamaz\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr "niteleme verisi v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "poliçe URL'si v3 (PGP 2.x tarzı) imzalara konulamaz\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr "poliçe URL'si v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA, 160 bitlik bir hash algoritması kullanılmasını gerektiriyor\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b6e803f50..86ae429e0 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -19,90 +19,90 @@ msgstr ""
 "X-Poedit-SourceCharset: iso-8859-1\n"
 "X-Poedit-Basepath: d:\\msys\\source\\gnupg-1.4.3\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "当 pbits=%u 而 qbits=%u 时不能生成质数\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "少于 %d 位时不能生成质数\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "检测不到熵搜集模块\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "无法锁定‘%s’：%s\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "等待‘%s’上的锁\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "无法获得文件‘%s’的信息： %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "‘%s’不是一个普通文件――已忽略\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "注意：随机数种子文件为空\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "警告：随机数种子文件大小无效――未使用\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "无法读取‘%s’：%s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "注意：随机数种子文件未被更新\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "无法写入‘%s’：%s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "无法关闭‘%s’：%s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "警告：正在使用不安全的随机数发生器！！\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -116,7 +116,7 @@ msgstr ""
 "绝对不要在现实世界中使用这个程序产生的任何数据！！\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -125,7 +125,7 @@ msgstr ""
 "请稍待片刻，系统此时正在搜集熵。如果您觉得无聊的话，不妨做些\n"
 "别的事——事实上这甚至能够让熵数的品质更好。\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -136,62 +136,62 @@ msgstr ""
 "随机字节不够多。请再做一些其他的琐事，以使操作系统能搜集到更多的熵！\n"
 "(还需要%d字节)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "无法存储指纹：%s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "无法存储创建日期：%s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr "响应未包含公钥数据\n"
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应未包含 RSA 余数\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应未包含 RSA 公钥指数\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr "尚未配置管理员命令的权限\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr "卡被永久锁定！\n"
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
@@ -199,342 +199,347 @@ msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr "|A|管理员 PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新的管理员 PIN"
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr "新的 PIN"
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 msgid "error reading application data\n"
 msgstr "读取应用程序数据时出错\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 msgid "error reading fingerprint DO\n"
 msgstr "读取指纹 D0 出错\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 msgid "key already exists\n"
 msgstr "密钥已存在\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr "现有的密钥将被替换\n"
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 msgid "generating new key\n"
 msgstr "生成新密钥\n"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr "缺少创建时间戳\n"
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 余数缺失或者不是 %d 位长\n"
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公钥指数缺失或长于 %d 位\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "无法存储密钥：%s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr "请稍候，正在生成密钥……\n"
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 msgid "generating key failed\n"
 msgstr "生成密钥失败\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "密钥已生成(耗时 %d 秒)\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡不支持散列算法 %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前已创建的签名：%lu\n"
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII 封装：%s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "无效的 ASCII 封装头："
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "ASCII 封装头："
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "无效的明文签名头\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "ASCII 封装头："
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "多层明文签名\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 msgid "unexpected armor: "
 msgstr "与预期不符的 ASCII 封装："
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "以连字符开头的行格式错误："
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "跳过无效的 64 进制字符 %02x\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "文件先于预期结束(没有 CRC 部分)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "文件先于预期结束(CRC 部分未结束)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "异常的 CRC\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 错误：%06lx - %06lx\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 msgid "premature eof (in trailer)\n"
 msgstr "文件先于预期结束(于结尾处)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "结尾行有问题\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "找不到有效的 OpenPGP 数据。\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "无效的 ASCII 封装：一行超过 %d 字符\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP 卡不可用：%s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "您的选择？ "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr "[未设定]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "unspecified"
 msgstr "未定义"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "not forced"
 msgstr "可选"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr "必须"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "错误：目前只允许使用 ASCII 字符。\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "错误：不能使用字符“<”。\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "错误：不允许出现两个空格。\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr "卡持有人的姓："
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr "卡持有人的名："
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "错误：合成的姓名太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 msgid "URL to retrieve public key: "
 msgstr "获取公钥的 URL："
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "错误：URL 太长(至多 %d 个字符)\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr "登录数据(帐号名)："
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "错误：登录数据太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr "个人 DO 数据："
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "错误：个人 DO 太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 msgid "Language preferences: "
 msgstr "首选语言："
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 msgid "Error: invalid length of preference string.\n"
 msgstr "错误：首选项字符串长度无效。\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 msgid "Error: invalid characters in preference string.\n"
 msgstr "错误：首选项字符串里有无效字符。\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)："
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 msgid "Error: invalid response.\n"
 msgstr "错误：无效的响应。\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 msgid "CA fingerprint: "
 msgstr "CA 指纹："
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "错误：指纹格式无效。\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "针对密钥的操作无法实现：%s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 msgid "not an OpenPGP card"
 msgstr "不是一个 OpenPGP 卡"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否为加密密钥创建卡外的备份？(Y/n)"
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -545,138 +550,138 @@ msgstr ""
 "  PIN = ‘%s’    管理员 PIN = ‘%s’\n"
 "您应当使用 --change-pin 命令来更改它们\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 msgid "Please select the type of key to generate:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 msgid "   (1) Signature key\n"
 msgstr "  (1) 签名密钥\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 msgid "   (2) Encryption key\n"
 msgstr "  (2) 加密密钥\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 认证密钥\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 msgid "Please select where to store the key:\n"
 msgstr "请选择在哪里存储密钥：\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 msgid "unknown key protection algorithm\n"
 msgstr "不支持的密钥保护算法\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 msgid "secret parts of key are not available\n"
 msgstr "私钥部分不可用\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "显示这份在线说明"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "list all available data"
 msgstr "列出所有可用数据"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr "更改卡持有人的姓名"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr "更改获取密钥的 URL"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr "根据卡中指定的 URL 获取密钥"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change the login name"
 msgstr "更改登录名"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "change the language preferences"
 msgstr "更改首选语言首选"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr "更改卡持有人的性别"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "change a CA fingerprint"
 msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr "设定 PIN 签名是否必须"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 msgid "generate new keys"
 msgstr "生成新的密钥"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr "更改或解锁 PIN 的菜单"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr "验证 PIN 并列出所有数据"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "命令> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 msgid "Admin-only command\n"
 msgstr "仅供管理员使用的命令\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 msgid "Admin commands are allowed\n"
 msgstr "允许使用管理员命令\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "私钥不可用"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "请插入卡并回车，或输入‘c’来取消："
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "删除密钥区块时失败：%s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -685,294 +690,294 @@ msgstr ""
 "请取出当前的卡，并插入有下列序列号的卡：\n"
 "  %.*s\n"
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "就绪后请回车，或输入‘c’取消"
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr "输入新的管理员 PIN："
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr "输入新的 PIN："
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr "输入管理员 PIN："
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr "输入 PIN："
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 msgid "Repeat this PIN: "
 msgstr "再次输入此 PIN："
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN 再次输入时与首次输入不符；请再试一次"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "密钥‘%s’找不到：%s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "读取密钥区块时发生错误：%s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(除非您用指纹指定密钥)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "在批处理模式中，没有“--yes”就无法这么做\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "要从钥匙环里删除这把密钥吗？(y/N)"
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "这是一把私钥！――真的要删除吗？(y/N)"
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "删除密钥区块时失败：%s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "信任度信息已被清除\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "公钥“%s”有对应的私钥！\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "在此 S2K 模式下无法使用对称的 ESK 包\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "使用对称加密算法 %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "‘%s’已被压缩\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告：‘%s’是一个空文件\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "在 --pgp2 模式中，您只能使用 2048 位及以下的 RSA 密钥加密\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "正在从‘%s’读取\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "您正要用来加密的所有密钥都不能使用 IDEA 算法。\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项中\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "您不该将 %s 用于 %s 模式中\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已经加密给：“%s”\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密过的数据\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告：报文被使用对称加密算法的弱密钥加密。\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "处理加密包有问题\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "不支持远程调用\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "由于配置文件权限不安全，外部程序调用被禁用\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "在这个操作平台上调用外部程序时需要临时文件\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "无法执行程序‘%s’：%s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "无法在命令解释环境中执行‘%s’：%s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "调用外部程序时发生系统错误：%s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "外部程序异常退出\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "无法执行外部程序\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "无法读取外部程序响应：%s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "警告：无法删除临时文件(%s)‘%s’：%s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "警告：无法删除临时目录‘%s’：%s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 msgid "export signatures that are marked as local-only"
 msgstr "导出被标记为局部的密名"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "导出属性用户标识(一般为照片标识)"
 
-#: g10/export.c:65
+#: g10/export.c:63
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "导出被标记为“敏感”的吊销密钥"
 
-#: g10/export.c:67
+#: g10/export.c:65
 msgid "remove the passphrase from exported subkeys"
 msgstr "从导出的子钥中删除所有密码"
 
-#: g10/export.c:69
+#: g10/export.c:67
 msgid "remove unusable parts from key during export"
 msgstr "导出时清除密钥中的不可用部分"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr "导出时尽可能清除密钥中的可选部分"
 
-#: g10/export.c:325
+#: g10/export.c:323
 msgid "exporting secret keys not allowed\n"
 msgstr "不允许导出私钥\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "密钥 %s：未被保护――已跳过\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "密钥 %s：密钥在卡上——已跳过\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr "准备导出一把不受保护的子钥\n"
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "无法取消保护子钥：%s\n"
 
 #  I hope this warning doesn't confuse people.
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "警告：私钥 %s 不存在简单 SK 检验和\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "警告：没有导出任何东西\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -980,127 +985,127 @@ msgstr ""
 "@指令：\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[文件名]|生成一份签名"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签名"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "生成一份分离的签名"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称加密"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "解密数据(默认)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "验证签名"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "列出密钥和签名"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签名"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "列出私钥"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "生成一副新的密钥对"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "从私钥钥匙环里删除密钥"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "为某把密钥添加签名"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "为某把密钥添加本地签名"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "编辑某把密钥或为其添加签名"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "生成一份吊销证书"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "把密钥导出到某个公钥服务器上"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "从公钥服务器上导入密钥"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "从公钥服务器更新所有的本地密钥"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "导入/合并密钥"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr "打印卡状态"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr "更改卡上的数据"
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr "更改卡的 PIN"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "更新信任度数据库"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1110,51 +1115,51 @@ msgstr ""
 "选项：\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "使用这个用户标识来签名或解密"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "详细模式"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "覆盖前先询问"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr "行为严格遵循 OpenPGP 定义"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr "生成与 PGP 2.x 兼容的报文"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1162,7 +1167,7 @@ msgstr ""
 "@\n"
 "(请参考在线说明以获得所有命令和选项的完整清单)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1182,17 +1187,17 @@ msgstr ""
 " --list-keys [某甲]           显示密钥\n"
 " --fingerprint [某甲]         显示指纹\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "请向 <[email protected]> 报告程序缺陷。\n"
 "请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1202,7 +1207,7 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1210,622 +1215,622 @@ msgstr ""
 "\n"
 "支持的算法：\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "对称加密："
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "压缩："
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在‘%s’组定义里找不到等号(=)\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’权限不安全\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’权限不安全\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’权限不安全\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示用户标识"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr "列出签名时显示策略 URL"
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 msgid "show all notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签名时显示用户提供的注记"
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出密钥时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已吊销或已过期的用户标识"
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的名称"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数据验证签名的有效性"
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提升带有有效 PKA 数据的签名的信任度"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "注意：%s 本版本中不可用\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk 缓存里项目太多――已禁用\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 msgid "[User ID not found]"
 msgstr "[找不到用户标识]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "自动获取‘%s’，通过 %s\n"
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子钥 %s 而非主钥 %s\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "从这个钥匙环里取用密钥"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳矛盾仅视为警告"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状态信息写入文件描述符 FD"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法：gpgv [选项] [文件] (用 -h 求助)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1833,7 +1838,7 @@ msgstr ""
 "语法：gpg [选项] [文件]\n"
 "用已知的受信任密钥来检查签名\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1842,7 +1847,7 @@ msgstr ""
 "在这里指定的数值完全由您自己决定；这些数值永远不会被输出给任何第三方。\n"
 "我们需要它来实现“信任网络”；这跟隐含建立起来的“验证网络”无关。"
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1852,16 +1857,16 @@ msgstr ""
 "要建立起信任网络，GnuPG 需要知道哪些密钥是可绝对信任的――通常\n"
 "就是您拥有私钥的那些密钥。回答“yes”将此密钥设成可绝对信任的\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "如果您无论如何要使用这把未被信任的密钥，请回答“yes”。"
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "输入您要递送的报文的接收者的用户标识。"
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1884,7 +1889,7 @@ msgstr ""
 "\n"
 "第一把密钥(主钥)必须具有签名的能力。"
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1893,16 +1898,16 @@ msgstr ""
 "通常来说用同一把密钥签名及加密并不是个好主意。这个算法只在特定的情况\n"
 "下使用。请先咨询安全方面的专家。"
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "请输入密钥的尺寸"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "请回答“yes”或“no”"
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1913,19 +1918,19 @@ msgstr ""
 "您可以输入 ISO 日期格式(YYYY-MM-DD)，但是出错时您不会得到友好的响应\n"
 "――系统会尝试将给定值解释为时间间隔。"
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "请输入密钥持有人的名字"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "请输入电子邮件地址(可选项，但强烈推荐使用)"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "请输入注释(可选项)"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1939,11 +1944,11 @@ msgstr ""
 "O  继续产生密钥。\n"
 "Q  中止产生密钥。"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "如果您允许生成子钥，请回答“yes”(或者“y”)。"
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2005,11 +2010,11 @@ msgstr ""
 "\n"
 "如果您不知道应该选什么答案的话，就选“0”。"
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "如果您想要为所有用户标识签名的话就选“yes”"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2017,11 +2022,11 @@ msgstr ""
 "如果您真的想要删除这个用户标识的话就回答“yes”。\n"
 "所有相关认证在此之后也会丢失！"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "如果可以删除这把子钥，请回答“yes”"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2031,7 +2036,7 @@ msgstr ""
 "因为要与这把密钥或拥有这把密钥的签名的密钥建立认证关系可能\n"
 "相当重要。"
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2042,13 +2047,13 @@ msgstr ""
 "直到您知道此签名使用了哪一把密钥；因为用来签名的密钥可能与\n"
 "其他已经验证的密钥存在信任关系。"
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "这份签名无效。应当把它从您的钥匙环里删除。"
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2061,7 +2066,7 @@ msgstr ""
 "只有在这把密钥的第一个自身签名因某些原因失效，而有第二个自身签\n"
 "字可用的情况下才这么做。"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2070,23 +2075,23 @@ msgstr ""
 "用现有的首选项更新所有(或选定的)用户标识的首选项。所有受影响的自身签\n"
 "字的时间戳都会增加一秒钟。\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "请再次输入上次的密码，以确定您到底键入了些什么。"
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "请给定要添加签名的文件名"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "如果可以覆盖这个文件，请回答“yes”"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2094,7 +2099,7 @@ msgstr ""
 "请输入一个新的文件名。如果您直接按下了回车，那么就会使用显示在括\n"
 "号中的默认的文件名。"
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2121,7 +2126,7 @@ msgstr ""
 "      如果这个用户标识不再被使用了，请选此项；这通常用表明某个电子邮\n"
 "      件地址已不再有效。\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2131,393 +2136,393 @@ msgstr ""
 "字简明扼要。\n"
 "键入一空行以结束输入。\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "没有可用的帮助"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "‘%s’没有可用的帮助"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr "导入被标记为局部的签名"
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr "导入时修复 PKS 公钥服务器导致的损坏"
 
-#: g10/import.c:100
+#: g10/import.c:98
 msgid "do not update the trustdb after import"
 msgstr "导入后不更新信任度数据库"
 
-#: g10/import.c:102
+#: g10/import.c:100
 msgid "create a public key when importing a secret key"
 msgstr "导入私钥时创建对应的公钥"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr "只接受对已有密钥的更新"
 
-#: g10/import.c:106
+#: g10/import.c:104
 msgid "remove unusable parts from key after import"
 msgstr "导入后清除密钥中无用的部分"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr "导入后尽可能清除密钥中的可选部分"
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "跳过 %d 样式的区块\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "目前已处理 %lu 把密钥\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "合计被处理的数量：%lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  已跳过的新密钥：%lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    遗失用户标识：%lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "          已导入：%lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          未改变：%lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      新用户标识：%lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "        新的子钥：%lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        新的签名：%lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "    新的密钥吊销：%lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      读取的私钥：%lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "      导入的私钥：%lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    未改变的私钥：%lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        未被导入：%lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "      清除的签名：%lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "  清除的用户标识：%lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, fuzzy, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的算法：\n"
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "      新用户标识：%lu\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         “%s”：对称加密算法 %s 对应首选项\n"
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         “%s”：散列算法 %s 对应首选项\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         “%s”：压缩算法 %s 对应首选项\n"
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "强烈建议您更新您的首选项并重新分发这把密钥，\n"
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "以避免可能的算法不匹配问题\n"
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "密钥 %s：没有用户标识\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "密钥 %s：PKS 子钥破损已修复\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "密钥 %s：已接受不含自身签名的用户标识“%s”\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "这可能由于遗失自身签名所致\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "密钥 %s：找不到公钥：%s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "密钥 %s：新密钥――已跳过\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "密钥 %s：公钥“%s”已导入\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "密钥 %s：与我们的副本不吻合\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "密钥 %s：“%s”一个新的用户标识\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "密钥 %s：“%s”1 个新的签名\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "密钥 %s：“%s”%d 个新的签名\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "密钥 %s：“%s”1 个新的子钥\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "密钥 %s：“%s”%d 个新的子钥\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "密钥 %s：“%s”未改变\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "不允许导入私钥\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "没有默认的私钥钥匙环： %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "密钥 %s：私钥已导入\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "密钥 %s：已在私钥钥匙环中\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "密钥 %s：找不到私钥：%s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "密钥 %s：“%s”吊销证书已被导入\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "密钥 %s：签名没有用户标识\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”自身签名无效\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "密钥 %s：没有可供绑定的子钥\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "密钥 %s：不支持的公钥算法\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "密钥 %s：无效的子钥绑定\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "密钥 %s：已删除多重子钥绑定\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "密钥 %s：无效的子钥吊销\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "密钥 %s：已删除多重子钥吊销\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "密钥 %s：已跳过用户标识“%s”\n"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "密钥 %s：已跳过子钥\n"
@@ -2526,133 +2531,133 @@ msgstr "密钥 %s：已跳过子钥\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "密钥 %s：不可导出的签名(验证级别 0x%02X)――已跳过\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "密钥 %s：子钥签名位置错误――已跳过\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "密钥 %s：与预期不符的签名验证级别(0x%02X)――已跳过\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "密钥 %s：已新增吊销证书“%s”\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "密钥 %s：已新增直接密钥签名\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "注意：密钥的序列号与卡的不符\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "注意：主钥在线，存储在卡上\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "注意：子钥在线，存储在卡上\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "建立钥匙环‘%s’时发生错误：%s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "钥匙环‘%s’已建立\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "密钥块资源‘%s’：%s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立钥匙环缓存失败： %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[吊销]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[自身签名]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 个损坏的签名\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 个损坏的签名\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份签名因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份签名因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份签名因为某个错误而未被检查\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份签名因为某些错误而未被检查\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "检测到 1 个没有有效自身签名的用户标识\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "检测到 %d 个没有有效自身签名的用户标识\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2663,17 +2668,17 @@ msgstr ""
 "查\n"
 "指纹等)？\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉强相信\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全相信\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2682,45 +2687,45 @@ msgstr ""
 "请输入这份信任签名的深度。\n"
 "深度若大于 1 则您将签名的这把密钥将可以以您的名义做出信任签名。\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "请输入这份签名的限制域，如果没有请按回车。\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "用户标识“%s”已被吊销。"
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "您仍然想要为它签名吗？(y/N)"
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  无法添加签名。\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "用户标识“%s”已过期。"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "警告：用户标识“%s”不含自身签名。"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "可以为用户标识“%s”添加签名。"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "为其添加签名吗？(y/N)"
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2729,75 +2734,75 @@ msgstr ""
 "“%s”的自身签名是 PGP 2.x 样\n"
 "式的签名。\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "您是否想要将它升级成 OpenPGP 的自身签名？(y/N)"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr "您目前为“%s”的签名已经过期了。\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "您想要发布一份新的签名来取代已过期的那一个吗？(y/N)"
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr "您目前为“%s”的签名是一份本地签名。\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "您是否想要把它升级成可以完全导出的签名？(y/N)"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“%s”已由密钥 %s 在本地签名\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“%s”已由密钥 %s 签名\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "您仍然想要为它再次签名吗？(y/N)"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "没有东西可以让密钥 %s 签名\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "这把密钥已经过期！"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "这把密钥将在 %s 过期。\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "您想要让您的签名也同时过期吗？ (Y/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "您不能在 --pgp2 模式下，用 PGP 2.x 密钥生成 OpenPGP 签名。\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2806,31 +2811,31 @@ msgstr ""
 "您是否谨慎地检查过，确认正要签名的密钥的确属于以上它所声称的所有者呢？\n"
 "如果您不知道这个问题的答案，请输入“0”。\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我不作答。 %s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本没有检查过。 %s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我随意检查过。 %s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我非常小心地检查过。 %s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 msgid "Your selection? (enter `?' for more information): "
 msgstr "您的选择？(输入‘?’以获得更多的信息)："
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2839,74 +2844,74 @@ msgstr ""
 "您真的确定要签名这把密钥，使用您的密钥\n"
 "“%s”(%s)\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 msgid "This will be a self-signature.\n"
 msgstr "这将是一个自身签名。\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告：这份签名不会被标记为不可导出。\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告：这份签名不会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "这份签名会被标记成不可导出。\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "这份签名会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "I have not checked this key at all.\n"
 msgstr "我根本没有检查过这把密钥。\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 msgid "I have checked this key casually.\n"
 msgstr "我随意检查过这把密钥。\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地检查过这把密钥。\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 msgid "Really sign? (y/N) "
 msgstr "真的要签名吗？(y/N)"
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签名时失败： %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主钥的私钥部分存储在卡上。\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "无法编辑这把密钥： %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2914,11 +2919,11 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2926,184 +2931,184 @@ msgstr ""
 "您不想要用密码――这大概是个坏主意！\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 msgid "Do you really want to do this? (y/N) "
 msgstr "您真的想要这么做吗？(y/N)"
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把密钥的签名移动到正确的位置去\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "保存并离开"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "显示密钥指纹"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "列出密钥和用户标识"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "选择用户标识 N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "选择子钥 N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "检查签名"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "为所选用户标识添加签名[* 参见下面的相关命令]"
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs locally"
 msgstr "为所选用户标识添加本地签名"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a trust signature"
 msgstr "为所选用户标识添加信任签名"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "为所选用户标识添加不可吊销签名"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "增加一个用户标识"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "增加一个照片标识"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 msgid "delete selected user IDs"
 msgstr "删除选定的用户标识"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "add a subkey"
 msgstr "添加一个子钥"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr "将一把密钥移动到智能卡上"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr "将备份密钥转移到卡上"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 msgid "delete selected subkeys"
 msgstr "删除选定的子钥"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "增加一把吊销密钥"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 msgid "delete signatures from the selected user IDs"
 msgstr "删除所选用户标识上的签名"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "变更密钥或所选子钥的使用期限"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 msgid "flag the selected user ID as primary"
 msgstr "将所选的用户标识设为首选用户标识"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 msgid "toggle between the secret and public key listings"
 msgstr "在私钥和公钥清单间切换"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "列出首选项(专家模式)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "列出首选项(详细模式)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "set preference list for the selected user IDs"
 msgstr "设定所选用户标识的首选项"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "设定所选用户标识的首选公钥服务器的 URL"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 msgid "set a notation for the selected user IDs"
 msgstr "为所选用户标识的设定注记"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "更改密码"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "更改信任度"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 msgid "revoke signatures on the selected user IDs"
 msgstr "吊销所选用户标识上的签名"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 msgid "revoke selected user IDs"
 msgstr "吊销选定的用户标识"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "revoke key or selected subkeys"
 msgstr "吊销密钥或选定的子钥"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 msgid "enable key"
 msgstr "启用密钥"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 msgid "disable key"
 msgstr "禁用密钥"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 msgid "show selected photo IDs"
 msgstr "显示选定的照片标识"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "压缩不可用的用户标识并删除不可用的签名"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "压缩不可用的用户标识并删除所有签名"
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "读取私钥区块“%s”时出错：%s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "私钥可用。\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "要有私钥才能这么做。\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "请先使用“toggle”指令。\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3114,245 +3119,245 @@ msgstr ""
 "  信任签名，或‘nr’前缀(nrsign)以添加不可吊销签名，或者以上三种前缀的任何组\n"
 "  合(ltsign、tnrsign 等)。\n"
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "密钥已被吊销。"
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的为所有的用户标识签名吗？(y/N)"
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示：选择要添加签名的用户标识\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的签名类型‘%s’\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允许使用这个指令。\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "您至少得选择一个用户标识。\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "您不能删除最后一个用户标识！\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要删除所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要删除这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要删除主钥吗？(y/N)"
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 msgid "You must select exactly one key.\n"
 msgstr "您必须指定一把密钥。\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr "命令需要一个文件名作为参数\n"
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "无法打开‘%s’：%s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "从‘%s’读取备份密钥时出错：%s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "您必须选择至少一把密钥。\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "您真的想要删除选定的密钥吗？(y/N)"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "您真的要删除这把密钥吗？(y/N)"
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要吊销所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要吊销这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "您真的要吊销整把密钥吗？(y/N)"
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "您真的要吊销选定的子钥吗？(y/N)"
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "您真的要吊销这把子钥吗？(y/N)"
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 msgid "Set preference list to:\n"
 msgstr "设为首选项列表为：\n"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新首选项吗？(y/N)"
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 msgid "Save changes? (y/N) "
 msgstr "要保存变动吗？(y/N)"
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 msgid "Quit without saving? (y/N) "
 msgstr "要不保存而离开吗？(y/N)"
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变动所以不需要更新。\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "散列："
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "特点："
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可变造"
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器："
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 msgid "Notations: "
 msgstr "注记："
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这把密钥可被 %s 密钥 %s 吊销"
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "已过期：%s"
 
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, c-format
 msgid "usage: %s"
 msgstr "可用于：%s"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr "卡号："
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 "警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3361,74 +3366,74 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自身签名吗？(y/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "无效"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3437,361 +3442,361 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识："
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "无法将 PGP 2.x 样式的密钥设为指定吊销者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "您不能将某把密钥设为它自己的指定吊销者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 msgid "Please select at most one subkey.\n"
 msgstr "请至多选择一个子钥。\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将要变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将要变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更 v3 密钥的使用期限\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私钥环里没有相应的签名\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "签名的子钥 %s 已经交叉验证\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子钥 %s 不签名，因此不需要交叉验证\n"
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签名\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N)"
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N)"
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 msgid "Enter the notation: "
 msgstr "输入注记："
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 msgid "Proceed? (y/N) "
 msgstr "继续？(y/N)"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的子钥\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "这份签名已在 %s 过期。\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签名生成一份吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签名：\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "首选项‘%s’重复\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "太多对称加密算法首选项\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "太多散列算法首选项\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "太多首选压缩算法\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "首选项字符串里有无效项‘%s’\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "正在写入直接签名\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "正在写入自身签名\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签名\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效：改用 %u 位\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 msgid "Sign"
 msgstr "签名"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr "验证"
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr "认证"
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 密钥可能的操作："
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr "目前允许的操作："
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 选择是否用于签名\n"
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 选择是否用于加密\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 选择是否用于认证\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA 和 ElGamal (默认)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (仅用于签名)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (自定义用途)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (仅用于加密)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (仅用于签名)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (仅用于加密)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (自定义用途)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA 密钥对会有 %u 位。\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "您想要用多大的密钥尺寸？(%u)"
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "您所要求的密钥尺寸是 %u 位\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3807,7 +3812,7 @@ msgstr ""
 "      <n>m = 密钥在 n 月后过期\n"
 "      <n>y = 密钥在 n 年后过期\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3823,38 +3828,38 @@ msgstr ""
 "      <n>m = 签名在 n 月后过期\n"
 "      <n>y = 签名在 n 年后过期\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期限是？(0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "签名的有效期限是多久？(%s) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "无效的数值\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 msgid "Key does not expire at all\n"
 msgstr "密钥永远不会过期\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 msgid "Signature does not expire at all\n"
 msgstr "签名永远不会过期\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "密钥于 %s 过期\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "签名于 %s 过期\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3862,11 +3867,11 @@ msgstr ""
 "您的系统无法显示 2038 年以后的日期。\n"
 "不过，它可以正确处理 2106 年之前的年份。\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 msgid "Is this correct? (y/N) "
 msgstr "以上正确吗？(y/n)"
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3882,44 +3887,44 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <[email protected]>”\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "真实姓名："
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "姓名含有无效的字符\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用数字开头\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五个字符长\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "电子邮件地址："
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "注释："
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "注释含有无效的字符\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3930,7 +3935,7 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 
@@ -3945,23 +3950,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3969,12 +3974,12 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -3986,7 +3991,7 @@ msgstr ""
 "再次执行这个程序，并且使用“--edit-key”选项即可。\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3996,50 +4001,50 @@ msgstr ""
 "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
 "鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在将公钥写至`%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和私钥已经生成并经签名。\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4047,695 +4052,695 @@ msgstr ""
 "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
 "生成用于加密的子钥。\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 msgid "Really create? (y/N) "
 msgstr "真的要建立吗？(y/N)"
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "向卡上存储密钥时失败：%s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "注意：卡密钥的备份已保存到‘%s’\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "永不过期"
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "关键签名策略："
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "签名策略："
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "关键首选公钥服务器："
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "关键签名注记："
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "签名注记："
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "钥匙环"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "主钥指纹："
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "子钥指纹："
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr " 主钥指纹："
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr " 子钥指纹："
 
 #  use tty
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 msgid "      Key fingerprint ="
 msgstr "密钥指纹 ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr "卡序列号 ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "警告：两个文件存在有互相矛盾的信息。\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s 是没有改变的那一个\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s 是新的那一个\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "请修补这个可能的安全性漏洞\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "缓存钥匙环‘%s’\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "目前已缓存 %lu 把密钥(%lu 份签名)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "缓存了 %lu 把密钥(%lu 份签名)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s：钥匙环已建立\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr "在搜索结果中包含已吊销的密钥"
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr "按钥匙号搜索时包含子钥"
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr "向公钥服务器辅助程序传递数据时使用临时文件"
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr "不删除使用过的临时文件"
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "验证签名时自动下载密钥"
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "使用密钥中指定的首选公钥服务器 URL"
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr "获取密钥时使用密钥上的 PKA 记录"
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "警告：公钥服务器选项‘%s’在此平台上没有被使用\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 msgid "disabled"
 msgstr "已禁用"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥“%s”\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 msgid "key not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "下载密钥‘%s’，从 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "下载密钥 %s，从 %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "在 %s 服务器 %s 上搜索名字\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "在 %s 上搜索名字\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "将密钥‘%s’上传到 %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "搜索“%s”，在 %s 上\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 msgid "no keyserver action!\n"
 msgstr "公钥服务器无动作！\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr "公钥服务器未发送 VERSION\n"
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "这一编译版本不支持外部调用公钥服务器\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "没有处理‘%s’公钥服务器的程序\n"
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s 不支持对版本 %d 的处理\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 msgid "keyserver timed out\n"
 msgstr "公钥服务器超时\n"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 msgid "keyserver internal error\n"
 msgstr "公钥服务器内部错误\n"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "公钥服务器通讯错误：%s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s”不是一个用户标识：跳过\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告：无法获取 URI %s：%s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "不能解析 URI %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密过的会话密钥尺寸(%d)诡异\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密过的会话密钥\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密码由未知的散列算法 %d 生成\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, c-format
 msgid "public key is %s\n"
 msgstr "公钥是 %s\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "公钥加密过的数据：完好的数据加密密钥\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n"
 
-#: g10/mainproc.c:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "由 %s 密钥加密、钥匙号为 %s\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公钥解密失败：%s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "以 %lu 个密码加密\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密码加密\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 为加密过的数据\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 算法不可用，试以 %s 代替\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告：报文未受到完整的保护\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已经变造！\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "注意：发件者要求您“只阅读不存盘”\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始文件名 =‘%.*s’\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 msgid "no signature found\n"
 msgstr "未找到签名\n"
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "签名验证已被抑制\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 msgid "can't handle this ambiguous signature data\n"
 msgstr "无法处理这些有歧义的签名\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签名建立于 %s\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "              使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签名，使用 %s，钥匙号 %s\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "可用的密钥在："
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已损坏的签名，来自于“%s”"
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签名，来自于“%s”"
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签名，来自于“%s”"
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[不确定]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, c-format
 msgid "                aka \"%s\""
 msgstr "              亦即“%s”"
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签名已于 %s 过期。\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签名在 %s 过期。\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 签名，散列算法 %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签名：%s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "不是一份分离的签名\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多重签名。只检查第一个签名。\n"
 
-#: g10/mainproc.c:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签名\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧式(PGP 2.x)签名\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中检测到无效的根包\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "无法禁用核心内存转储：%s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "‘%s’的 fstat 在 %s 中出错：%s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "警告: 使用试验性质的公钥算法 %s\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "警告：使用试验性质的对称加密算法 %s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "警告：使用试验性质的散列算法 %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告：不建议使用散列算法 %s\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 算法插件不存在\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "请参见 %s 以得到更多信息。\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d：不建议使用该选项“%s”\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告：“%s”选项已不建议使用\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "请以“%s%s”代替\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告：“%s”命令已不建议使用——不要使用它\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "不压缩"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 msgid "uncompressed|none"
 msgstr "未压缩|无"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s 也许不能使用这个报文\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "文件‘%s’已存在。 "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 msgid "Overwrite? (y/N) "
 msgstr "是否覆盖？(y/N)"
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s：未知的后缀名\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "请输入新的文件名"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "正在写入到标准输出\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "假定被签名的数据是‘%s’\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "新的配置文件‘%s’已建立\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "无法操作公钥算法 %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告：潜在不安全的对称加密会话密钥\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类别的子包设定了关键位\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主钥匙号 %s)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4746,48 +4751,48 @@ msgstr ""
 "“%.*s”\n"
 "%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "请再输入一次密码\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "请输入密码\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "用户取消\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr "在批处理模式中无法查询密码\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "请输入密码："
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr "您需要输入密码，才能解开这个用户的私钥：“%s”\n"
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位的 %s 密钥，钥匙号 %s，建立于 %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (主钥 %s 的子钥)"
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "请再输入一次密码："
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4800,116 +4805,116 @@ msgstr ""
 "片会被存放在您的公钥里。如果您挑了非常大的图片的话，您的密钥也会变得非\n"
 "常大！请尽量把图片尺寸控制在240x288左右，这是个理想的尺寸。\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "输入要当作相片标识的JPEG文件名： "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "无法打开 JPEG 文件‘%s’：%s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "这个 JPEG 文件太大了(%d 字节)！\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "您确定要用它吗？(y/N)"
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "“%s”不是一个 JPEG 文件\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "这张照片正确吗？(y/N/q)"
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr "没有设置照片查看程序\n"
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "无法显示照片标识！\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "密钥被替换"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "密钥已泄漏"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "密钥不再使用"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "用户标识不再有效"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "吊销原因："
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "吊销注释："
 
 #  a string with valid answers
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 msgid "No trust value assigned to:\n"
 msgstr "下列项目没有指定信任度：\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  亦即“%s”\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "您是否相信这把密钥属于它所声称的持有者？\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = 我不知道或我不作答\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = 我不相信\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = 我绝对相信\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 msgid "  m = back to the main menu\n"
 msgstr "  m = 回到主菜单\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  s = skip this key\n"
 msgstr "  s = 跳过这把密钥\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  q = quit\n"
 msgstr "  q = 退出\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -4918,37 +4923,37 @@ msgstr ""
 "这把密钥的最小信任等级为：%s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "您的决定是什么？"
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "您真的要把这把密钥设成绝对信任？(y/N)"
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "被绝对信任的密钥的证书：\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s：没有证据表明这把密钥真的属于它所声称的持有者\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s：只有有限的证据表明这把密钥属于它所声称的持有者\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 msgid "This key probably belongs to the named user\n"
 msgstr "这把密钥有可能属于它所声称的持有者\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "这把密钥是属于我们的\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -4957,105 +4962,105 @@ msgstr ""
 "这把密钥并不一定属于用户标识声称的那个人。如果您真的知道自\n"
 "己在做什么，您可以在下一个问题回答 yes。\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 msgid "Use this key anyway? (y/N) "
 msgstr "无论如何还是使用这把密钥吗？(y/N)"
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "警告：正在使用不被信任的密钥！\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "警告：此密钥可能已被吊销(吊销密钥不存在)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "警告：这把密钥已经被它的指定吊销者吊销了！\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "警告：这把密钥已经被它的持有者吊销了！\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "         This could mean that the signature is forged.\n"
 msgstr "      这表明这个签名有可能是伪造的。\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "警告：这把子钥已经被它的持有者吊销了！\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "注意：这把密钥已经被禁用了。\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "注意：验证过的签名者的地址是‘%s’\n"
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr "注意：签名者的地址‘%s’不匹配任何 DNS 记录\n"
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr "PKA 信息有效，信任级别调整到“完全”\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr "PKA 信息无效，信任级别调整到“从不”\n"
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "注意：这把密钥已经过期了！\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告：这把密钥未经受信任的签名认证！\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "      没有证据表明这个签名属于它所声称的持有者。\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "警告：我们不信任这把密钥！\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "      这个签名很有可能是伪造的。\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "警告：这把密钥未经有足够信任度的签名所认证。\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      这份签名并不一定属于它所声称的持有者\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s：已跳过：%s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳过：公钥已存在\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr "当前收件人：\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5063,166 +5068,166 @@ msgstr ""
 "\n"
 "输入用户标识。以空白行结束："
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "没有这个用户标识。\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳过：公钥已被设为默认收件者\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "公钥被禁用。\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "已跳过：公钥已被设定\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "未知的默认收件者“%s”\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s：已跳过：公钥已被禁用\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "没有有效的地址\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "数据未被保存；请用“--output”选项来保存它们\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立‘%s’时发生错误：%s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "分离的签名。\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "请输入数据文件的名称： "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "正在从标准输入读取 ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "不含签名的数据\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "无法打开有签名的数据‘%s’\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "匿名收件者；正在尝试使用私钥 %s ……\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "很好，我们就是匿名收件者。\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "不支持旧式的 DEK 编码\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "对称加密算法 %d%s 未知或已停用\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "注意：收件人的首选项中找不到加密算法 %s\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "注意：私钥 %s 已于 %s 过期\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "注意：密钥已被吊销"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失败：%s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "将被吊销，吊销者：\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(这是一把敏感的吊销密钥)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要为这把密钥建立一份指定吊销者证书吗？(y/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "已强行使用 ASCII 封装过的输出。\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失败： %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "已建立吊销证书。\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "没有找到“%s”的吊销密钥\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找不到私钥“%s”：%s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "没有相对应的公钥：%s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "公钥与私钥不吻合！\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "要为这把密钥建立一份吊销证书吗？(y/N)"
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "未知的保护算法\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "注意：这把密钥没有被保护！\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5240,241 +5245,225 @@ msgstr ""
 "小心：您的机器上的打印系统可能会在打印过程中把这些数据临时在某个其他\n"
 "人也能够看得到的地方！\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "请选择吊销的原因：\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "取消"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(也许您会想要在这里选择 %d)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "请输入描述(可选)；以空白行结束：\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "吊销原因：%s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(不给定描述)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 msgid "Is this okay? (y/N) "
 msgstr "这样可以吗？ (y/N)"
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "私钥部分不可用\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "保护算法 %d%s 未被支持\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "不支持保护散列 %d\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "无效的密码；请再试一次"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s……\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "警告：检测到弱密钥――请更换密码。\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "正在产生私钥保护使用的旧式 16 位校验和\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "建立了弱密钥――正在重试\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "对称加密无法避免生成弱密钥；已经尝试 %d 次！\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA 需要散列值长度为 8 位的倍数\n"
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr "DSA 密钥 %s 使用不安全的(%u 位)的散列\n"
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr "DSA 密钥 %s 需要 %u 位或更长的散列\n"
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "警告：签名散列值与报文不一致\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "警告：签名的子钥 %s 未经交叉验证\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "警告：签名的子钥 %s 交叉验证无效\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "公钥 %s 在其签名后 %lu 秒生成\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "公钥 %s 在其签名后 %lu 秒生成\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "注意：签名密钥 %s 已于 %s 过期\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "密钥 %s：没有子钥吊销签名所需的子钥\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "密钥 %s：没有子钥绑定签名所需的子钥\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "无法在 v3 (PGP 2.x样式)的签名内放入注记数据\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入注记数据\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "警告：注记 %% 无法扩展(太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "无法在 v3 (PGP 2.x样式)的签名内放入策略 URL\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入策略 URL\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告：无法 %%-扩展策略 URL (太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "警告：无法 %%-扩展首选公钥服务器 URL (太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 签名来自：“%s”\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做分离签名\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "正在签名："
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做明文签名\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密将被采用\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "密钥未被标示为不安全――不能与假的随机数发生器共同使用！\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "“%s”已跳过：重复\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "“%s”已跳过：%s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "已跳过：私钥已存在\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "这是一把由 PGP 生成的 ElGamal 密钥，用于签名不安全！"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任记录 %lu，类别 %d：写入失败：%s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5483,341 +5472,341 @@ msgstr ""
 "# 已指定的信任度的清单，建立于 %s \n"
 "# (请用“gpg --import-ownertrust”导入这些信任度)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "‘%s’中出错：%s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "列太长"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "冒号缺失"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "指纹无效"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "没有信任度"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "读取‘%s’错误：%s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任度数据库：同步失败：%s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任度数据库记录 %lu：lseek 失败：%s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任度数据库记录 %lu：write 失败 (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "信任度数据库处理量过大\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "无法存取‘%s’：%s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s：目录不存在！\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "不能为‘%s’创建锁定\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "无法锁定‘%s’\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s：建立版本记录失败：%s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s：建立了无效的信任度数据库\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s：建立了信任度数据库\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "注意：信任度数据库不可写入\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s：无效的信任度数据库\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s：建立散列表失败：%s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s：更新版本记录时出错： %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s：读取版本记录时出错： %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s：写入版本记录时出错：%s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信任度数据库：lseek 失败：%s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信任度数据库：read 失败(n=%d)：%s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s：不是一个信任度数据库文件\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s：记录编号为%lu的版本记录\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s：无效的文件版本%d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s：读取自由记录时出错：%s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s：写入目录记录时出错：%s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s：记录归零时失败：%s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s：附加记录时失败：%s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "信任度数据库已损坏；请执行“gpg --fix-trustdb”。\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "无法处理长于 %d 字符的文本行\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "输入行长度超过 %d 字符\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "‘%s’不是一个有效的长式钥匙号\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "密钥 %s：受信任，已接受\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "密钥 %s 在信任度数据库中重复出现\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "密钥 %s：受信任的密钥没有公钥――已跳过\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "密钥 %s 被标记为绝对信任\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "信任记录 %lu，请求类别 %d：读取失败：%s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "信任记录 %lu 不属于所请求的类别 %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "无法使用未知的信任模型(%d)――假定使用 %s 信任模型\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "使用 %s 信任模型\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[已吊销]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[已过期]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[ 未知 ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[未定义]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[ 勉强 ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[ 完全 ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[ 绝对 ]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "未定义"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "从不"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "勉强"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "完全"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "绝对"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数据库检查将于 %s 进行\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公钥 %s：%s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "请执行一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "正在检查信任度数据库\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "没有找到任何绝对信任的密钥\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "深度：%d 有效性：%3d 已签名：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5832,304 +5821,316 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "输入行 %u 太长或者行末的换行符 LF 遗失\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "常规错误"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "未知的包类型"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "未知的版本"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "未知的公钥算法"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "未知的散列算法"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "公钥已经损坏"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "私钥已经损坏"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "签名已经损坏"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "校验和错误"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "错误的密码"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "找不到公钥"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "未知的对称加密算法"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "无法打开钥匙环"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "无效包"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "无效的 ASCII 封装格式"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "没有这个用户标识"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "私钥不可用"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "使用了错误的私钥"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "未被支持"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "密钥已损坏"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "文件读取错误"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "文件写入错误"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "未知的压缩算法"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "文件打开错误"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "文件建立错误"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "无效的密码"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "未实现的公钥算法"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "未实现的对称加密算法"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "未知的签名等级"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "信任度数据库错误"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "损坏的多精度整数(MPI)"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "资源限制"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "无效的钥匙环"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "证书已损坏"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "被变造过的用户标识"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "文件关闭错误"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "文件重命名错误"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "文件删除错误"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "非预期的数据"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "时间戳冲突"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "无法使用的公钥算法"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "文件已存在"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "弱密钥"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "无效的参数"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "URI 已损坏"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "未被支持的 URI"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "网络错误"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "未被加密"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "未被处理"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "不可用的公钥"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "不可用的私钥"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "公钥服务器错误"
 
-#: util/errors.c:109
+#: util/errors.c:107
 msgid "canceled"
 msgstr "已取消"
 
-#: util/errors.c:110
+#: util/errors.c:108
 msgid "no card"
 msgstr "没有卡"
 
-#: util/errors.c:111
+#: util/errors.c:109
 msgid "no data"
 msgstr "无数据"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr "错误："
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr "警告："
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "……这是个程序缺陷(%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "您找到一个程序缺陷了……(%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr "okay|ok"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr "cancel|cancel"
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "警告：正在使用不安全的内存！\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "请访问 http://www.gnupg.org/faq.html 以获得更详细的信息\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "安全内存未初始化，不能进行操作\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(您可能使用了错误的程序来完成此项任务)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "无法在 v3 (PGP 2.x样式)的签名内放入注记数据\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入注记数据\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "无法在 v3 (PGP 2.x样式)的签名内放入策略 URL\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入策略 URL\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA 要求使用 160 位的散列算法\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b208e955f..baeb3eaf9 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-04-03 13:28+0200\n"
+"POT-Creation-Date: 2007-10-23 12:03+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"
@@ -17,90 +17,90 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/primegen.c:121
+#: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
 msgstr "無法以 %u 位元長的 p 以及 %u 位元長的 q 產生質數\n"
 
-#: cipher/primegen.c:312
+#: cipher/primegen.c:310
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "無法產生少於 %d 位元的質數\n"
 
-#: cipher/random.c:173
+#: cipher/random.c:171
 msgid "no entropy gathering module detected\n"
 msgstr "偵測不到亂數蒐集模組\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:401
 #, fuzzy, c-format
 msgid "can't lock `%s': %s\n"
 msgstr "無法鎖定 `%s'\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:406
 #, fuzzy, c-format
 msgid "waiting for lock on `%s'...\n"
 msgstr "正在將私鑰寫至 `%s'\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1012 g10/gpg.c:3513 g10/import.c:195 g10/keygen.c:2392
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
-#: g10/plaintext.c:492 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1115
-#: g10/sign.c:1266 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
-#: g10/tdbio.c:605
+#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
+#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
+#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390
+#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
+#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
+#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: cipher/random.c:458
+#: cipher/random.c:456
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "無法取得檔案 `%s' 的資訊: %s\n"
 
-#: cipher/random.c:463
+#: cipher/random.c:461
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' 不是一個標準的檔案 - 已略過\n"
 
-#: cipher/random.c:468
+#: cipher/random.c:466
 msgid "note: random_seed file is empty\n"
 msgstr "請注意: random_seed 檔案是空的\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:472
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "警告: random_seed 檔案大小無效 - 不予採用\n"
 
-#: cipher/random.c:482
+#: cipher/random.c:480
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "無法讀取 `%s': %s\n"
 
-#: cipher/random.c:520
+#: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
 msgstr "請注意: random_seed 檔案未被更新\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1011 g10/keygen.c:2878
-#: g10/keygen.c:2908 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
-#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1131 g10/tdbio.c:536
+#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876
+#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
+#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:554 cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "無法寫入 `%s': %s\n"
 
-#: cipher/random.c:569
+#: cipher/random.c:567
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "無法關閉 `%s': %s\n"
 
-#: cipher/random.c:814
+#: cipher/random.c:812
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "警告: 正在使用不安全的隨機數字產生器!!\n"
 
-#: cipher/random.c:815
+#: cipher/random.c:813
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -114,7 +114,7 @@ msgstr ""
 "*** 絕對不要把這個程式產生的任何資料拿來用!! ***\n"
 "\n"
 
-#: cipher/rndegd.c:202
+#: cipher/rndegd.c:200
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -123,7 +123,7 @@ msgstr ""
 "請稍待片刻, 系統此時正在蒐集亂數. 如果妳會覺得無聊的話,\n"
 "不妨做些別的事, 這樣子甚至能夠讓亂數的品質更好.\n"
 
-#: cipher/rndlinux.c:132
+#: cipher/rndlinux.c:130
 #, c-format
 msgid ""
 "\n"
@@ -134,62 +134,62 @@ msgstr ""
 "隨機位元組不夠多. 請多做一些有的沒的事情, \n"
 "這樣作業系統纔能蒐集到更多的亂數! (還需要 %d 位元組)\n"
 
-#: g10/app-openpgp.c:596
+#: g10/app-openpgp.c:594
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: g10/app-openpgp.c:609
+#: g10/app-openpgp.c:607
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "存放創生資料失敗: %s\n"
 
-#: g10/app-openpgp.c:977
+#: g10/app-openpgp.c:975
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包含公鑰資料\n"
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包含 RSA 系數\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包含 RSA 公用指數\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "個人識別碼 (PIN) 收回時傳回錯誤: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "用於 CHV %d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV %d 失敗: %s\n"
 
-#: g10/app-openpgp.c:1310
+#: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
 msgstr "取用管理者指令尚未被組態過\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387
 msgid "error retrieving CHV status from card\n"
 msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396
 msgid "card is permanently locked!\n"
 msgstr "卡片已被永久鎖住了!!\n"
 
-#: g10/app-openpgp.c:1336
+#: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d 管理者個人識別碼 (PIN) 試圖在卡片被永久鎖定前遺留下來\n"
@@ -197,342 +197,347 @@ msgstr "%d 管理者個人識別碼 (PIN) 試圖在卡片被永久鎖定前遺�
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1343
+#: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
 msgstr "|AN|New Admin PIN"
 
-#: g10/app-openpgp.c:1492
+#: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
 msgstr "|N|New PIN"
 
-#: g10/app-openpgp.c:1496
+#: g10/app-openpgp.c:1494
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
 msgid "error reading application data\n"
 msgstr "讀取應用程式資料時出錯\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
 msgid "error reading fingerprint DO\n"
 msgstr "讀取指紋 DO 時出錯\n"
 
-#: g10/app-openpgp.c:1562
+#: g10/app-openpgp.c:1560
 msgid "key already exists\n"
 msgstr "金鑰已存在\n"
 
-#: g10/app-openpgp.c:1566
+#: g10/app-openpgp.c:1564
 msgid "existing key will be replaced\n"
 msgstr "既有的金鑰將被取代\n"
 
-#: g10/app-openpgp.c:1568
+#: g10/app-openpgp.c:1566
 msgid "generating new key\n"
 msgstr "正在產生新的金鑰\n"
 
-#: g10/app-openpgp.c:1735
+#: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
 msgstr "建立的時間戳印缺漏\n"
 
-#: g10/app-openpgp.c:1742
+#: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 模組缺漏或者尺寸並非 %d 位元\n"
 
-#: g10/app-openpgp.c:1749
+#: g10/app-openpgp.c:1747
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 質數 %s 缺漏或者尺寸並非 %d 位元\n"
 
-#: g10/app-openpgp.c:1827
+#: g10/app-openpgp.c:1825
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
 msgstr "公鑰正被產生中, 請稍候 ...\n"
 
-#: g10/app-openpgp.c:1901
+#: g10/app-openpgp.c:1899
 msgid "generating key failed\n"
 msgstr "產生金鑰時失敗\n"
 
-#: g10/app-openpgp.c:1904
+#: g10/app-openpgp.c:1902
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "金鑰產生已完工 (%d 秒)\n"
 
-#: g10/app-openpgp.c:1961
+#: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP 卡片的格式無效 (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2087
+#: g10/app-openpgp.c:2085
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: g10/app-openpgp.c:2134
+#: g10/app-openpgp.c:2132
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前建立的簽章: %lu\n"
 
-#: g10/app-openpgp.c:2142
+#: g10/app-openpgp.c:2140
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: g10/app-openpgp.c:2403
+#: g10/app-openpgp.c:2401
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "管理者個人識別碼 (PIN) 之驗證目前在此指令中被禁止了\n"
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
 
-#: g10/armor.c:372
+#: g10/armor.c:383
 #, c-format
 msgid "armor: %s\n"
 msgstr "封裝: %s\n"
 
-#: g10/armor.c:411
+#: g10/armor.c:422
 msgid "invalid armor header: "
 msgstr "無效的封裝檔頭: "
 
-#: g10/armor.c:422
+#: g10/armor.c:433
 msgid "armor header: "
 msgstr "封裝檔頭: "
 
-#: g10/armor.c:433
+#: g10/armor.c:446
 msgid "invalid clearsig header\n"
 msgstr "無效的明文簽章檔頭\n"
 
-#: g10/armor.c:485
+#: g10/armor.c:459
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "封裝檔頭: "
+
+#: g10/armor.c:512
 msgid "nested clear text signatures\n"
 msgstr "多層明文簽章\n"
 
-#: g10/armor.c:620
+#: g10/armor.c:647
 msgid "unexpected armor: "
 msgstr "未預期的封裝: "
 
-#: g10/armor.c:632
+#: g10/armor.c:659
 msgid "invalid dash escaped line: "
 msgstr "無效的破折號逸出列: "
 
-#: g10/armor.c:786 g10/armor.c:1396
+#: g10/armor.c:813 g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "無效的 64 進位字符 %02x 被跳過了\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
 msgstr "檔案未預期的結束 (沒有 CRC 的部分)\n"
 
-#: g10/armor.c:863
+#: g10/armor.c:890
 msgid "premature eof (in CRC)\n"
 msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
 
-#: g10/armor.c:871
+#: g10/armor.c:898
 msgid "malformed CRC\n"
 msgstr "CRC 被變造過\n"
 
-#: g10/armor.c:875 g10/armor.c:1433
+#: g10/armor.c:902 g10/armor.c:1460
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 錯誤; %06lX - %06lX\n"
 
-#: g10/armor.c:895
+#: g10/armor.c:922
 msgid "premature eof (in trailer)\n"
 msgstr "檔案未預期的結束 (於結尾處)\n"
 
-#: g10/armor.c:899
+#: g10/armor.c:926
 msgid "error in trailer line\n"
 msgstr "結尾列有問題\n"
 
-#: g10/armor.c:1210
+#: g10/armor.c:1237
 msgid "no valid OpenPGP data found.\n"
 msgstr "找不到有效的 OpenPGP 資料.\n"
 
-#: g10/armor.c:1215
+#: g10/armor.c:1242
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "無效的封裝: 列長超出 %d 字符\n"
 
-#: g10/armor.c:1219
+#: g10/armor.c:1246
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:61 g10/card-util.c:304
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 
-#: g10/card-util.c:68
+#: g10/card-util.c:66
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2576 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516
+#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1389
-#: g10/keygen.c:1456
+#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387
+#: g10/keygen.c:1454
 msgid "Your selection? "
 msgstr "妳要選哪一個? "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:214 g10/card-util.c:264
 msgid "[not set]"
 msgstr "[未設定]"
 
-#: g10/card-util.c:413
+#: g10/card-util.c:411
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:414
+#: g10/card-util.c:412
 msgid "unspecified"
 msgstr "未特定"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "not forced"
 msgstr "不強迫使用"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:439
 msgid "forced"
 msgstr "強迫使用"
 
-#: g10/card-util.c:519
+#: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "錯誤: 目前祇允許使用單純的 ASCII 字元.\n"
 
-#: g10/card-util.c:521
+#: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "錯誤: 不能使用 \"<\" 字元.\n"
 
-#: g10/card-util.c:523
+#: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
 
-#: g10/card-util.c:540
+#: g10/card-util.c:538
 msgid "Cardholder's surname: "
 msgstr "卡片持有者的姓氏: "
 
-#: g10/card-util.c:542
+#: g10/card-util.c:540
 msgid "Cardholder's given name: "
 msgstr "卡片持有者的教名: "
 
-#: g10/card-util.c:560
+#: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:581
+#: g10/card-util.c:579
 msgid "URL to retrieve public key: "
 msgstr "取回公鑰的 URL: "
 
-#: g10/card-util.c:589
+#: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "錯誤: URL 太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
+#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: g10/card-util.c:695
+#: g10/card-util.c:693
 msgid "Login data (account name): "
 msgstr " 登入資料 (帳號名稱): "
 
-#: g10/card-util.c:705
+#: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "錯誤: 登入資料太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:764
+#: g10/card-util.c:762
 msgid "Private DO data: "
 msgstr "私人的 DO 資料: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:794
+#: g10/card-util.c:792
 msgid "Language preferences: "
 msgstr "介面語言偏好設定: "
 
-#: g10/card-util.c:802
+#: g10/card-util.c:800
 msgid "Error: invalid length of preference string.\n"
 msgstr "錯誤: 偏好設定字串的長度無效\n"
 
-#: g10/card-util.c:811
+#: g10/card-util.c:809
 msgid "Error: invalid characters in preference string.\n"
 msgstr "錯誤: 偏好設定字串中含有無效的字元\n"
 
-#: g10/card-util.c:832
+#: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性別 ((M)ale, (F)emale 或留空): "
 
-#: g10/card-util.c:846
+#: g10/card-util.c:844
 msgid "Error: invalid response.\n"
 msgstr "錯誤: 無效的回應.\n"
 
-#: g10/card-util.c:867
+#: g10/card-util.c:865
 msgid "CA fingerprint: "
 msgstr "憑證中心 (CA) 指紋: "
 
-#: g10/card-util.c:890
+#: g10/card-util.c:888
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "錯誤: 指紋格式化無效.\n"
 
-#: g10/card-util.c:938
+#: g10/card-util.c:936
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "不可能進行金鑰操作: %s\n"
 
-#: g10/card-util.c:939
+#: g10/card-util.c:937
 msgid "not an OpenPGP card"
 msgstr "這不是 OpenPGP 卡片"
 
-#: g10/card-util.c:948
+#: g10/card-util.c:946
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: g10/card-util.c:1033
+#: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1052 g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
 
-#: g10/card-util.c:1075
+#: g10/card-util.c:1073
 msgid "Replace existing keys? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1084
+#: g10/card-util.c:1082
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -543,138 +548,138 @@ msgstr ""
 "   PIN = `%s'     管理者 (Admin) PIN = `%s'\n"
 "妳應該用 --change-pin 指令來加以變更\n"
 
-#: g10/card-util.c:1123
+#: g10/card-util.c:1121
 msgid "Please select the type of key to generate:\n"
 msgstr "請選擇妳要產生的金鑰種類:\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1123 g10/card-util.c:1204
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1124 g10/card-util.c:1206
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1125 g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:940
-#: g10/keygen.c:1393 g10/keygen.c:1421 g10/keygen.c:1495 g10/revoke.c:685
+#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
+#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
-#: g10/card-util.c:1203
+#: g10/card-util.c:1201
 msgid "Please select where to store the key:\n"
 msgstr "請選擇要把金鑰存放在哪裡:\n"
 
-#: g10/card-util.c:1238
+#: g10/card-util.c:1236
 msgid "unknown key protection algorithm\n"
 msgstr "未知的金鑰保護演算法\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1241
 msgid "secret parts of key are not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: g10/card-util.c:1248
+#: g10/card-util.c:1246
 msgid "secret key already stored on a card\n"
 msgstr "私鑰已經存放於卡片上了\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1351
+#: g10/card-util.c:1317 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "離開這個選單"
 
-#: g10/card-util.c:1321
+#: g10/card-util.c:1319
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1354
+#: g10/card-util.c:1320 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
-#: g10/card-util.c:1324
+#: g10/card-util.c:1322
 msgid "list all available data"
 msgstr "列出所有可用的資料"
 
-#: g10/card-util.c:1327
+#: g10/card-util.c:1325
 msgid "change card holder's name"
 msgstr "變更卡片持有人的名字"
 
-#: g10/card-util.c:1328
+#: g10/card-util.c:1326
 msgid "change URL to retrieve key"
 msgstr "變更要取回金鑰的 URL"
 
-#: g10/card-util.c:1329
+#: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
 msgstr "從卡片 URL 取回指定的金鑰"
 
-#: g10/card-util.c:1330
+#: g10/card-util.c:1328
 msgid "change the login name"
 msgstr "變更登入姓名"
 
-#: g10/card-util.c:1331
+#: g10/card-util.c:1329
 msgid "change the language preferences"
 msgstr "變更介面語言偏好設定"
 
-#: g10/card-util.c:1332
+#: g10/card-util.c:1330
 msgid "change card holder's sex"
 msgstr "變更卡片持有者的性別"
 
-#: g10/card-util.c:1333
+#: g10/card-util.c:1331
 msgid "change a CA fingerprint"
 msgstr "變更某個憑證中心 (CA) 指紋"
 
-#: g10/card-util.c:1334
+#: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
 msgstr "切換簽章強制個人識別碼 (PIN) 的旗標"
 
-#: g10/card-util.c:1335
+#: g10/card-util.c:1333
 msgid "generate new keys"
 msgstr "產生新的金鑰"
 
-#: g10/card-util.c:1336
+#: g10/card-util.c:1334
 msgid "menu to change or unblock the PIN"
 msgstr "變更或解凍個人識別碼 (PIN) 的選單"
 
-#: g10/card-util.c:1337
+#: g10/card-util.c:1335
 msgid "verify the PIN and list all data"
 msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1621
+#: g10/card-util.c:1455 g10/keyedit.c:1619
 msgid "Command> "
 msgstr "指令> "
 
-#: g10/card-util.c:1495
+#: g10/card-util.c:1493
 msgid "Admin-only command\n"
 msgstr "限管理者使用的指令\n"
 
-#: g10/card-util.c:1526
+#: g10/card-util.c:1524
 msgid "Admin commands are allowed\n"
 msgstr "允許使用管理者指令\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1526
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2242
+#: g10/card-util.c:1600 g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
-#: g10/cardglue.c:416
+#: g10/cardglue.c:414
 #, fuzzy
 msgid "card reader not available\n"
 msgstr "無法取用私鑰"
 
-#: g10/cardglue.c:434
+#: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "請插入卡片並按下 [Enter], 或者輸入 'c' 以取消: "
 
-#: g10/cardglue.c:446
+#: g10/cardglue.c:444
 #, fuzzy, c-format
 msgid "selecting openpgp failed: %s\n"
 msgstr "刪除金鑰區塊時失敗了: %s\n"
 
-#: g10/cardglue.c:573
+#: g10/cardglue.c:571
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -683,298 +688,298 @@ msgstr ""
 "請移除現用中的卡片並插入下列序號的卡片:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:582
+#: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "準備好時請按下 [Enter], 或者輸入 'c' 以取消: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
 msgstr "請輸入新的管理者個人識別碼 (PIN): "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:916
 msgid "Enter New PIN: "
 msgstr "請輸入新的個人識別碼 (PIN): "
 
-#: g10/cardglue.c:919
+#: g10/cardglue.c:917
 msgid "Enter Admin PIN: "
 msgstr "請輸入管理者個人識別碼 (PIN): "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:918
 msgid "Enter PIN: "
 msgstr "請輸入個人識別碼 (PIN): "
 
-#: g10/cardglue.c:937
+#: g10/cardglue.c:935
 msgid "Repeat this PIN: "
 msgstr "請再次輸入個人識別碼 (PIN): "
 
-#: g10/cardglue.c:952
+#: g10/cardglue.c:950
 msgid "PIN not correctly repeated; try again"
 msgstr "個人識別碼 (PIN) 再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3878 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375
+#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:103 g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個命令中沒有作用\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3390 g10/keyserver.c:1705
-#: g10/revoke.c:228
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "金鑰 \"%s\" 找不到: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725
+#: g10/revoke.c:232 g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "讀取金鑰區塊時發生錯誤: %s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(除非妳用指紋指定了金鑰)\n"
 
-#: g10/delkey.c:135
+#: g10/delkey.c:133
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "沒有 \"--yes\" 就沒辦法在批次模式中這麼做\n"
 
-#: g10/delkey.c:147
+#: g10/delkey.c:145
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "要從鑰匙圈裡刪除這把金鑰嗎? (y/N) "
 
-#: g10/delkey.c:155
+#: g10/delkey.c:153
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "這是一把私鑰! - 真的要刪除嗎? (y/N) "
 
-#: g10/delkey.c:165
+#: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "刪除金鑰區塊時失敗了: %s\n"
 
-#: g10/delkey.c:175
+#: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
 msgstr "主觀信任資訊已經被清除\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:204
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:206
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encode.c:213 g10/sign.c:1286
+#: g10/encode.c:211 g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: g10/encode.c:218
+#: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "因為處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
 
-#: g10/encode.c:231
+#: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
 msgstr "正在使用編密法 %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:239 g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' 已經被壓縮了\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告: `%s' 是一個空檔案\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "在 --pgp2 模式中, 妳祇能以 2048 位元以下的 RSA 金鑰加密\n"
 
-#: g10/encode.c:480
+#: g10/encode.c:478
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "正在從 `%s' 讀取中\n"
 
-#: g10/encode.c:508
+#: g10/encode.c:506
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "妳正要用來加密的所有金鑰都不能使用 IDEA 編密法.\n"
 
-#: g10/encode.c:518
+#: g10/encode.c:516
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用對稱式編密法 %s (%d) 會違反收件者偏好設定\n"
 
-#: g10/encode.c:628 g10/sign.c:963
+#: g10/encode.c:612 g10/sign.c:931
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告: 強迫使用壓縮演算法 %s (%d) 會違反收件者偏好設定\n"
 
-#: g10/encode.c:715
+#: g10/encode.c:699
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "妳不能夠將 %s 用於 %s 模式中\n"
 
-#: g10/encode.c:812
+#: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已經加密給: \"%s\"\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:292
+#: g10/encr-data.c:89 g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密過的資料\n"
 
-#: g10/encr-data.c:93 g10/mainproc.c:296
+#: g10/encr-data.c:91 g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的演算法 %d 加密過\n"
 
-#: g10/encr-data.c:117
+#: g10/encr-data.c:115
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告: 訊息被以對稱式編密法的弱金鑰加密了.\n"
 
-#: g10/encr-data.c:128
+#: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
 msgstr "處理加密的封包有問題\n"
 
-#: g10/exec.c:49
+#: g10/exec.c:47
 msgid "no remote program execution supported\n"
 msgstr "沒有已支援的遠端程式執行\n"
 
-#: g10/exec.c:176 g10/openfile.c:421
+#: g10/exec.c:174 g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: g10/exec.c:317
+#: g10/exec.c:315
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "因為不安全的檔案權限選項, 而禁用了外部程式叫用\n"
 
-#: g10/exec.c:347
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "在這個作業平台上叫用外部程式時需要暫存檔\n"
 
-#: g10/exec.c:425
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "無法執行程式 `%s': %s\n"
 
-#: g10/exec.c:428
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "無法執行 shell `%s': %s\n"
 
-#: g10/exec.c:513
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "叫用外部程式時發生系統錯誤: %s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "外部程式不自然地離開\n"
 
-#: g10/exec.c:539
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "無法執行外部程式\n"
 
-#: g10/exec.c:555
+#: g10/exec.c:553
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "無法讀取外部程式回應: %s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "警告: 無法移除暫存檔 (%s) `%s': %s\n"
 
-#: g10/exec.c:613
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "警告: 無法移除暫存目錄 `%s': %s\n"
 
-#: g10/export.c:61
+#: g10/export.c:59
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "這份簽章會被標記成不可撤銷.\n"
 
-#: g10/export.c:63
+#: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:65
+#: g10/export.c:63
 #, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
 
-#: g10/export.c:67
+#: g10/export.c:65
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "撤銷金鑰或所選的次鑰"
 
-#: g10/export.c:69
+#: g10/export.c:67
 #, fuzzy
 msgid "remove unusable parts from key during export"
 msgstr "從金鑰中清除無法使用的部分"
 
-#: g10/export.c:71
+#: g10/export.c:69
 msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:325
+#: g10/export.c:323
 msgid "exporting secret keys not allowed\n"
 msgstr "未被允許匯出私鑰\n"
 
-#: g10/export.c:354
+#: g10/export.c:352
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "金鑰 %s: 未被保護 - 已跳過\n"
 
-#: g10/export.c:362
+#: g10/export.c:360
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "金鑰 %s: PGP 2.x 樣式的金鑰 - 已跳過\n"
 
-#: g10/export.c:373
+#: g10/export.c:371
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 
-#: g10/export.c:521
+#: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:544
+#: g10/export.c:542
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
 #  I hope this warning doesn't confuse people.
-#: g10/export.c:565
+#: g10/export.c:563
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "警告: 私鑰 %s 並沒有任的何單一 SK 加總檢查\n"
 
-#: g10/export.c:598
+#: g10/export.c:596
 msgid "WARNING: nothing exported\n"
 msgstr "警告: 沒有匯出任何東西\n"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:381
 msgid ""
 "@Commands:\n"
 " "
@@ -982,127 +987,127 @@ msgstr ""
 "@指令:\n"
 " "
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "|[file]|make a signature"
 msgstr "|[檔案]|建立一份簽章"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "make a detached signature"
 msgstr "建立一份分離式簽章"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:388
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "verify a signature"
 msgstr "驗證某份簽章"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "list keys"
 msgstr "列出金鑰"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "list keys and signatures"
 msgstr "列出金鑰和簽章"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:397
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "list secret keys"
 msgstr "列出私鑰"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:400
 msgid "generate a new key pair"
 msgstr "產生一份新的金鑰對"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
 msgstr "從私鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "sign a key"
 msgstr "簽署某把金鑰"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "sign a key locally"
 msgstr "僅在本地簽署某把金鑰"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:406
 msgid "sign or edit a key"
 msgstr "簽署或編輯某把金鑰"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:407
 msgid "generate a revocation certificate"
 msgstr "產生一份撤銷憑證"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "export keys to a key server"
 msgstr "把金鑰匯出至某個金鑰伺服器上"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "import keys from a key server"
 msgstr "從某個金鑰伺服器上匯入金鑰"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "search for keys on a key server"
 msgstr "在某個金鑰伺服器上搜尋金鑰"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:415
 msgid "update all keys from a keyserver"
 msgstr "從某個金鑰伺服器上更新所有的金鑰"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "import/merge keys"
 msgstr "匯入/合併金鑰"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "print the card status"
 msgstr "列印卡片狀態"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:423
 msgid "change data on a card"
 msgstr "變更卡片上的資料"
 
-#: g10/gpg.c:422
+#: g10/gpg.c:424
 msgid "change a card's PIN"
 msgstr "變更某張卡片的個人識別碼 (PIN)"
 
-#: g10/gpg.c:431
+#: g10/gpg.c:433
 msgid "update the trust database"
 msgstr "更新信任資料庫"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:440
 msgid "|algo [files]|print message digests"
 msgstr "|演算法 [檔案]|印出訊息摘要"
 
-#: g10/gpg.c:442 g10/gpgv.c:70
+#: g10/gpg.c:444 g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1112,51 +1117,51 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/gpg.c:444
+#: g10/gpg.c:446
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:446
+#: g10/gpg.c:448
 msgid "|NAME|encrypt for NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: g10/gpg.c:457
+#: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
 msgstr "使用這個使用者 ID 來簽署或解密"
 
-#: g10/gpg.c:458
+#: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:465
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:479
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: g10/gpg.c:479 g10/gpgv.c:72
+#: g10/gpg.c:481 g10/gpgv.c:70
 msgid "verbose"
 msgstr "囉唆模式"
 
-#: g10/gpg.c:490
+#: g10/gpg.c:492
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:493
 msgid "prompt before overwriting"
 msgstr "覆寫前先詢問"
 
-#: g10/gpg.c:532
+#: g10/gpg.c:535
 msgid "use strict OpenPGP behavior"
 msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:536
 msgid "generate PGP 2.x compatible messages"
 msgstr "產生 PGP 2.x 相容性訊息"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:565
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1164,7 +1169,7 @@ msgstr ""
 "@\n"
 "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/gpg.c:565
+#: g10/gpg.c:568
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1184,15 +1189,15 @@ msgstr ""
 " --list-keys [名字]         顯示金鑰\n"
 " --fingerprint [名字]       顯示指紋\n"
 
-#: g10/gpg.c:766 g10/gpgv.c:97
+#: g10/gpg.c:769 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
 
-#: g10/gpg.c:783
+#: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpg.c:786
+#: g10/gpg.c:789
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1202,7 +1207,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:797
+#: g10/gpg.c:800
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1210,629 +1215,629 @@ msgstr ""
 "\n"
 "已被支援的演算法:\n"
 
-#: g10/gpg.c:800
+#: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:806 g10/keyedit.c:2308
+#: g10/gpg.c:809 g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/gpg.c:812
+#: g10/gpg.c:815
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:818 g10/keyedit.c:2354
+#: g10/gpg.c:821 g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:901
+#: g10/gpg.c:904
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1049
+#: g10/gpg.c:1052
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/gpg.c:1067
+#: g10/gpg.c:1070
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1270
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1282
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1288
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1294
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1300
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1306
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1309
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1447
+#: g10/gpg.c:1450
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1543
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1545
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1547
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1549
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1553
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1555
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1557
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1559
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1561
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1563
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1565
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1959
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
 
-#: g10/gpg.c:1999
+#: g10/gpg.c:2001
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: g10/gpg.c:2003
+#: g10/gpg.c:2005
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2012
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項\n"
 
-#: g10/gpg.c:2226 g10/gpg.c:2863 g10/gpg.c:2882
+#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2239
+#: g10/gpg.c:2241
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "編密法延伸模組 `%s' 因為權限不安全而未被載入\n"
 
-#: g10/gpg.c:2405 g10/gpg.c:2417
+#: g10/gpg.c:2430 g10/gpg.c:2442
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2494
+#: g10/gpg.c:2519
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是一個有效的字元集\n"
 
-#: g10/gpg.c:2518 g10/gpg.c:2707 g10/keyedit.c:4078
+#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URI\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2555
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2533
+#: g10/gpg.c:2558
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2565
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2543
+#: g10/gpg.c:2568
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2575
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2578
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2585
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2588
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2596
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2598
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2602
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2606
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2608
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2610
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2612
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2614
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2616
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2618
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2625
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2628
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2610
+#: g10/gpg.c:2635
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2773
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2776
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2885
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2889
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會使得 %s 失效\n"
 
-#: g10/gpg.c:2865
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不被允許跟 %s 併用\n"
 
-#: g10/gpg.c:2868
+#: g10/gpg.c:2901
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2908
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "注意: %s 在本版中無法使用\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2923
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2937
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:2910
+#: g10/gpg.c:2943
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2949
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2962
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:2996 g10/gpg.c:3020
+#: g10/gpg.c:3029 g10/gpg.c:3053
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3002 g10/gpg.c:3026
+#: g10/gpg.c:3035 g10/gpg.c:3059
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:3008
+#: g10/gpg.c:3041
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3047
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3062
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:3031
+#: g10/gpg.c:3064
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:3033
+#: g10/gpg.c:3066
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3068
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3070
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3073
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3077
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3084
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:3060
+#: g10/gpg.c:3093
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3097
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3101
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3134
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3181
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "妳不該將編密演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3186
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "妳不該將摘要演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3191
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "妳不該將壓縮演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3293
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3304
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3315
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3322
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3324
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 的對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3334
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3347
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3316
+#: g10/gpg.c:3349
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3352
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3337
+#: g10/gpg.c:3370
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3350
+#: g10/gpg.c:3383
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3398
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3390
+#: g10/gpg.c:3423
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3432
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3457
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3465
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3469
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3490
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3528
+#: g10/gpg.c:3561
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [使用者ID] [鑰匙圈]"
 
-#: g10/gpg.c:3570
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器時失敗: %s\n"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3605
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收時失敗: %s\n"
 
-#: g10/gpg.c:3574
+#: g10/gpg.c:3607
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出時失敗: %s\n"
 
-#: g10/gpg.c:3585
+#: g10/gpg.c:3618
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "從金鑰伺服器中搜尋時失敗: %s\n"
 
-#: g10/gpg.c:3595
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新時失敗: %s\n"
 
-#: g10/gpg.c:3646
+#: g10/gpg.c:3679
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3654
+#: g10/gpg.c:3687
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3774
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3897
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3901
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始鍵入妳的訊息 ...\n"
 
-#: g10/gpg.c:4172
+#: g10/gpg.c:4205
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:4174
+#: g10/gpg.c:4207
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4207
+#: g10/gpg.c:4240
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/getkey.c:152
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk 快取裡有太多項目 - 已禁用\n"
 
-#: g10/getkey.c:175
+#: g10/getkey.c:173
 msgid "[User ID not found]"
 msgstr "[找不到使用者 ID]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
-#: g10/getkey.c:999
+#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1831
+#: g10/getkey.c:1829
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:2388 g10/keyedit.c:3721
+#: g10/getkey.c:2386 g10/keyedit.c:3719
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
 
-#: g10/getkey.c:2619
+#: g10/getkey.c:2617
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
 
-#: g10/getkey.c:2666
+#: g10/getkey.c:2664
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
 
-#: g10/gpgv.c:73
+#: g10/gpgv.c:71
 msgid "be somewhat more quiet"
 msgstr "盡量安靜些"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:72
 msgid "take the keys from this keyring"
 msgstr "從這個鑰匙圈裡取用金鑰"
 
-#: g10/gpgv.c:76
+#: g10/gpgv.c:74
 msgid "make timestamp conflicts only a warning"
 msgstr "僅把時間戳印矛盾視為警告"
 
-#: g10/gpgv.c:77
+#: g10/gpgv.c:75
 msgid "|FD|write status info to this FD"
 msgstr "|檔案描述|把狀態資訊寫入此檔案描述"
 
-#: g10/gpgv.c:101
+#: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法: gpgv [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpgv.c:104
+#: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -1840,7 +1845,7 @@ msgstr ""
 "語法: gpg [選項] [檔案]\n"
 "用已知的受信任金鑰來檢查簽章\n"
 
-#: g10/helptext.c:49
+#: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -1849,7 +1854,7 @@ msgstr ""
 "在這裡指派的數值完全是看妳自己決定; 這些數值永遠不會被匯出給其他人.\n"
 "我們需要它來實施信任網絡; 這跟 (自動建立起的) 憑證網絡一點關係也沒有."
 
-#: g10/helptext.c:55
+#: g10/helptext.c:53
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -1860,16 +1865,16 @@ msgstr ""
 "那些金鑰通常就是妳有辦法存取到私鑰的. 回答 \"yes\" 來將這些\n"
 "金鑰設成被徹底信任的\n"
 
-#: g10/helptext.c:62
+#: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "如果妳無論如何想要使用這把未被信任的金鑰, 請回答 \"yes\"."
 
-#: g10/helptext.c:66
+#: g10/helptext.c:64
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "輸入妳要遞送的訊息接收者的使用者 ID."
 
-#: g10/helptext.c:70
+#: g10/helptext.c:68
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -1893,7 +1898,7 @@ msgstr ""
 "\n"
 "第一把 (主要的) 金鑰一定要含有能用於簽署的金鑰."
 
-#: g10/helptext.c:84
+#: g10/helptext.c:82
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -1903,16 +1908,16 @@ msgstr ""
 "這個演算法應該祇被用於特定的情況下.\n"
 "請先聯絡妳的安全專家."
 
-#: g10/helptext.c:91
+#: g10/helptext.c:89
 msgid "Enter the size of the key"
 msgstr "請輸入金鑰的尺寸"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "請回答 \"yes\" 或 \"no\""
 
-#: g10/helptext.c:105
+#: g10/helptext.c:103
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -1923,19 +1928,19 @@ msgstr ""
 "妳可以輸入 ISO 日期格式 (YYYY-MM-DD), 但是不會得到良好的錯誤回應 -\n"
 "反之, 系統會試著把給定的數值中斷成若干片段."
 
-#: g10/helptext.c:117
+#: g10/helptext.c:115
 msgid "Enter the name of the key holder"
 msgstr "請輸入金鑰持有人的名字"
 
-#: g10/helptext.c:122
+#: g10/helptext.c:120
 msgid "please enter an optional but highly suggested email address"
 msgstr "請輸入選用 (但強烈建議使用) 的電子郵件位址"
 
-#: g10/helptext.c:126
+#: g10/helptext.c:124
 msgid "Please enter an optional comment"
 msgstr "請輸入選用的註釋"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:129
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -1949,11 +1954,11 @@ msgstr ""
 "O  繼續產生金鑰.\n"
 "Q  中止產生金鑰."
 
-#: g10/helptext.c:140
+#: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "如果妳覺得產生子鑰可以的話, 就回答 \"yes\" (或者祇要 \"y\")."
 
-#: g10/helptext.c:148
+#: g10/helptext.c:146
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -2022,11 +2027,11 @@ msgstr ""
 "\n"
 "如果妳不知道應該選甚麼答案的話, 就選 \"0\"."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:184
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "如果妳想要簽署 *所有* 使用者 ID 的話就回答 \"yes\""
 
-#: g10/helptext.c:190
+#: g10/helptext.c:188
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2034,11 +2039,11 @@ msgstr ""
 "如果妳真的想要刪除這個使用者 ID 的話就回答 \"yes\".\n"
 "所有的憑證在那之後也都會失去!"
 
-#: g10/helptext.c:195
+#: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "如果刪除這把子鑰沒問題的話就回答 \"yes\""
 
-#: g10/helptext.c:200
+#: g10/helptext.c:198
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2048,7 +2053,7 @@ msgstr ""
 "因為要跟別的金鑰建立起信任連結, 或由這把金鑰所簽署的金鑰憑證\n"
 "會是一件相當重要的事."
 
-#: g10/helptext.c:205
+#: g10/helptext.c:203
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2059,13 +2064,13 @@ msgstr ""
 "直到妳知道哪一把金鑰被使用了; 因為這把來簽署的金鑰可能透過\n"
 "其他已經驗證的金鑰建立了一個信任連結."
 
-#: g10/helptext.c:211
+#: g10/helptext.c:209
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr "這份簽章無效. 把它從妳的鑰匙圈裡移去相當合理."
 
-#: g10/helptext.c:215
+#: g10/helptext.c:213
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2079,7 +2084,7 @@ msgstr ""
 "把金鑰的第一個自我簽章因某些原因無效, 而第二\n"
 "個還可用的情況下纔這麼做."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:221
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
@@ -2088,23 +2093,23 @@ msgstr ""
 "變更所有 (或祇有被選取的那幾個) 使用者 ID 的偏好成現用的偏好清單.\n"
 "所有受到影響的自我簽章的時間戳記都會增加一秒鐘.\n"
 
-#: g10/helptext.c:230
+#: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: g10/helptext.c:236
+#: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "請再次輸入最後的密語, 以確定妳到底鍵進了些甚麼."
 
-#: g10/helptext.c:240
+#: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
 msgstr "請給定簽章所要套用的檔案名稱"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "如果覆寫這個檔案沒有問題的話就回答 \"yes\""
 
-#: g10/helptext.c:250
+#: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2112,7 +2117,7 @@ msgstr ""
 "請輸入一個新的檔名. 如果妳直接按下了 Enter, 那麼\n"
 "就會使用預設的檔案 (顯示在括號中)."
 
-#: g10/helptext.c:256
+#: g10/helptext.c:254
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2140,7 +2145,7 @@ msgstr ""
 "      如果這個使用者 ID 不再被使用了, 就選這個;\n"
 "      這通常用來表示某個電子郵件位址不再有效了.\n"
 
-#: g10/helptext.c:272
+#: g10/helptext.c:270
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -2150,396 +2155,396 @@ msgstr ""
 "請讓這段文字保持簡明扼要.\n"
 "鍵入空白列以結束這段文字.\n"
 
-#: g10/helptext.c:287
+#: g10/helptext.c:285
 msgid "No help available"
 msgstr "沒有可用的說明"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:293
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s' 沒有可用的說明"
 
-#: g10/import.c:96
+#: g10/import.c:94
 msgid "import signatures that are marked as local-only"
 msgstr ""
 
-#: g10/import.c:98
+#: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
-#: g10/import.c:100
+#: g10/import.c:98
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "更新信任資料庫"
 
-#: g10/import.c:102
+#: g10/import.c:100
 #, fuzzy
 msgid "create a public key when importing a secret key"
 msgstr "公鑰與私鑰並不吻合!\n"
 
-#: g10/import.c:104
+#: g10/import.c:102
 msgid "only accept updates to existing keys"
 msgstr ""
 
-#: g10/import.c:106
+#: g10/import.c:104
 #, fuzzy
 msgid "remove unusable parts from key after import"
 msgstr "從金鑰中清除無法使用的部分"
 
-#: g10/import.c:108
+#: g10/import.c:106
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:267
+#: g10/import.c:265
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "正在跳過 %d 型態的區塊\n"
 
-#: g10/import.c:276
+#: g10/import.c:274
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "已有 %lu 把金鑰被處理了\n"
 
-#: g10/import.c:293
+#: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "總共被處理的數量: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:293
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        已跳過的新金鑰: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:296
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "       沒有使用者的 ID: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:298
 #, c-format
 msgid "              imported: %lu"
 msgstr "                已匯入: %lu"
 
-#: g10/import.c:306
+#: g10/import.c:304
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              未改變的: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:306
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         新的使用者 ID: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:308
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              新的子鑰: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:310
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              新的簽章: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:312
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          新的金鑰撤銷: %lu\n"
 
-#: g10/import.c:316
+#: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "          被讀取的私鑰: %lu\n"
 
-#: g10/import.c:318
+#: g10/import.c:316
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "          已匯入的私鑰: %lu\n"
 
-#: g10/import.c:320
+#: g10/import.c:318
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "          未改變的私鑰: %lu\n"
 
-#: g10/import.c:322
+#: g10/import.c:320
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              未被匯入: %lu\n"
 
-#: g10/import.c:324
+#: g10/import.c:322
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "      已被清除掉的簽章: %lu\n"
 
-#: g10/import.c:326
+#: g10/import.c:324
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " 已被清除掉的使用者 ID: %lu\n"
 
-#: g10/import.c:567
+#: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "警告: 金鑰 %s 含有不可用的偏好設定\n"
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
-#: g10/import.c:571
+#: g10/import.c:569
 #, fuzzy
 msgid "         algorithms on these user IDs:\n"
 msgstr "這些使用者 ID 上的演算法:\n"
 
-#: g10/import.c:608
+#: g10/import.c:606
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": 編密演算法 %s 的偏好設定\n"
 
-#: g10/import.c:620
+#: g10/import.c:618
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": 摘要演算法 %s 的偏好設定\n"
 
-#: g10/import.c:632
+#: g10/import.c:630
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": 壓縮演算法 %s 的偏好設定\n"
 
-#: g10/import.c:645
+#: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "我們強烈建議妳更新妳的偏好設定, 並\n"
 
-#: g10/import.c:647
+#: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "重新散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
 
-#: g10/import.c:671
+#: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "妳可以像這樣更新妳的偏好設定: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:721 g10/import.c:1119
+#: g10/import.c:719 g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "金鑰 %s: 沒有使用者 ID\n"
 
-#: g10/import.c:750
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
 
-#: g10/import.c:765
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "金鑰 %s: 非自我簽署的使用者 ID \"%s\" 已被接受\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 
-#: g10/import.c:773
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "這可能是由於遺失自我簽章所導致的後果\n"
 
-#: g10/import.c:783 g10/import.c:1241
+#: g10/import.c:781 g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "金鑰 %s: 找不到公鑰: %s\n"
 
-#: g10/import.c:789
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 
-#: g10/import.c:798
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫的鑰匙圈: %s\n"
 
-#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1136
+#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在寫到 `%s'\n"
 
-#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
-#: g10/import.c:2364 g10/import.c:2386
+#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
+#: g10/import.c:2374 g10/import.c:2396
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/import.c:826
+#: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "金鑰 %s: 公鑰 \"%s\" 已被匯入\n"
 
-#: g10/import.c:850
+#: g10/import.c:848
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 
-#: g10/import.c:867 g10/import.c:1259
+#: g10/import.c:865 g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "金鑰 %s: 無法定位原始的金鑰區塊: %s\n"
 
-#: g10/import.c:875 g10/import.c:1266
+#: g10/import.c:873 g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
 
-#: g10/import.c:912
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
 
-#: g10/import.c:915
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
 
-#: g10/import.c:918
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的簽章\n"
 
-#: g10/import.c:921
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的簽章\n"
 
-#: g10/import.c:924
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的子鑰\n"
 
-#: g10/import.c:927
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的子鑰\n"
 
-#: g10/import.c:930
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/import.c:933
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/import.c:936
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 個使用者 ID\n"
 
-#: g10/import.c:939
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 個使用者 ID\n"
 
-#: g10/import.c:962
+#: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "金鑰 %s: \"%s\" 沒有被改變\n"
 
-#: g10/import.c:1125
+#: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "金鑰 %s: 私鑰使用了無效的編密法 %d - 已跳過\n"
 
-#: g10/import.c:1136
+#: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
 msgstr "未被允許匯入私鑰\n"
 
-#: g10/import.c:1153 g10/import.c:2379
+#: g10/import.c:1151 g10/import.c:2389
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "沒有預設的私鑰鑰匙圈: %s\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "金鑰 %s: 私鑰被匯入了\n"
 
-#: g10/import.c:1194
+#: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "金鑰 %s: 已經在私鑰鑰匙圈中了\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1202
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "金鑰 %s: 找不到私鑰: %s\n"
 
-#: g10/import.c:1234
+#: g10/import.c:1232
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
 
-#: g10/import.c:1277
+#: g10/import.c:1275
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
 
-#: g10/import.c:1309
+#: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "金鑰 %s: \"%s\" 撤銷憑證已被匯入\n"
 
-#: g10/import.c:1375
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 使用了未被支援的公鑰演算法\n"
 
-#: g10/import.c:1392
+#: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 有無效的自我簽章\n"
 
-#: g10/import.c:1410
+#: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "金鑰 %s: 沒有子鑰可供附帶\n"
 
-#: g10/import.c:1421 g10/import.c:1471
+#: g10/import.c:1419 g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "金鑰 %s: 未被支援的公鑰演算法\n"
 
-#: g10/import.c:1423
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "金鑰 %s: 無效的附帶子鑰\n"
 
-#: g10/import.c:1438
+#: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "金鑰 %s: 多重附帶子鑰已被移除\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1458
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
 
-#: g10/import.c:1473
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "金鑰 %s: 無效的子鑰撤銷\n"
 
-#: g10/import.c:1488
+#: g10/import.c:1486
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
 
-#: g10/import.c:1530
+#: g10/import.c:1528
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
 
-#: g10/import.c:1551
+#: g10/import.c:1549
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "金鑰 %s: 子鑰已跳過\n"
@@ -2548,133 +2553,133 @@ msgstr "金鑰 %s: 子鑰已跳過\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1578
+#: g10/import.c:1576
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
 
-#: g10/import.c:1588
+#: g10/import.c:1586
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1605
+#: g10/import.c:1603
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1617
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1627
+#: g10/import.c:1625
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
 
-#: g10/import.c:1727
+#: g10/import.c:1737
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
 
-#: g10/import.c:1789
+#: g10/import.c:1799
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
 
-#: g10/import.c:1803
+#: g10/import.c:1813
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
 
-#: g10/import.c:1862
+#: g10/import.c:1872
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
 
-#: g10/import.c:1896
+#: g10/import.c:1906
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2295
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "請注意: 某份金鑰的序號 (S/N) 與卡片的序號並不吻合\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2303
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "請注意: 主鑰在線上且已存放於卡片上了\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2305
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "請注意: 次鑰在線上且已存放於卡片上了\n"
 
-#: g10/keydb.c:168
+#: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keydb.c:175
+#: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "鑰匙圈 `%s' 已建立\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
+#: g10/keydb.c:314 g10/keydb.c:317
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "金鑰區塊資源 `%s': %s\n"
 
-#: g10/keydb.c:698
+#: g10/keydb.c:696
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立鑰匙圈快取失敗: %s\n"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[撤銷]"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[自我簽章]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:343 g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 個損壞的簽章\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:345 g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 個損壞的簽章\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:347 g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:349 g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:351 g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份簽章因為某個錯誤而未被檢查\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:353 g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份簽章因為某些錯誤而未被檢查\n"
 
-#: g10/keyedit.c:357
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "偵測到 1 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:359
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "偵測到 %d 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:264
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2684,17 +2689,17 @@ msgstr ""
 "請判斷妳有多信任這位使用者確實驗證其他使用者的金鑰\n"
 "(像是查對身份證, 或從不同的來源檢查指紋等...）的能力\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉強信任\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:278
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全信任\n"
 
-#: g10/keyedit.c:439
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2704,45 +2709,45 @@ msgstr ""
 "深度大於 1 的話就表示妳信任這把正被簽署的金鑰,\n"
 "同時也信任這把金鑰所簽署的信任簽章.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "使用者 ID \"%s\" 已經被撤銷了."
 
-#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:830
-#: g10/keyedit.c:890 g10/keyedit.c:1740
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
+#: g10/keyedit.c:888 g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "妳仍然想要簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:836
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  無法簽署.\n"
 
-#: g10/keyedit.c:628
+#: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "使用者 ID \"%s\" 已經過期了."
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:654
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "使用者 ID \"%s\" 未經自我簽署."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:682
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "使用者 ID \"%s\" 可被簽署."
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:684
 msgid "Sign it? (y/N) "
 msgstr "是否要簽署? (y/N) "
 
-#: g10/keyedit.c:708
+#: g10/keyedit.c:706
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2751,11 +2756,11 @@ msgstr ""
 "\"%s\" 裡的自我簽章\n"
 "是 PGP 2.x 型態的簽章.\n"
 
-#: g10/keyedit.c:717
+#: g10/keyedit.c:715
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "妳是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:729
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2764,11 +2769,11 @@ msgstr ""
 "妳目前在 \"%s\" 的簽章\n"
 "已經過期了.\n"
 
-#: g10/keyedit.c:735
+#: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "妳想要發佈一份新的簽章來取代已過期的那一個嗎? (y/N) "
 
-#: g10/keyedit.c:756
+#: g10/keyedit.c:754
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2777,53 +2782,53 @@ msgstr ""
 "妳目前在 \"%s\" 的簽章\n"
 "是一份本地簽章.\n"
 
-#: g10/keyedit.c:760
+#: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "妳是否想要把他升級成可以完全匯出的簽章? (y/N) "
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 在本地簽署了\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:782
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:787
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "妳仍然想要再次簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:809
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "沒有東西可以讓金鑰 %s 簽署\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:822
 msgid "This key has expired!"
 msgstr "這把金鑰已經過期了!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "這把金鑰將在 %s 過期.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:846
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "妳想要讓妳的簽章也在同一個時候過期嗎? (Y/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:881
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "妳不能在 --pgp2 模式下, 拿 PGP 2.x 金鑰做出 OpenPGP 簽章.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:883
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "這會讓這把金鑰在 PGP 2.x 模式下不可使用.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:908
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2832,31 +2837,31 @@ msgstr ""
 "妳有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
 "如果妳不知道這個問題的答案, 請輸入 \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:913
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我不作答.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:915
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本沒有檢查過.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:917
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我隨意檢查過了.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我非常小心地檢查過了.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:925
 msgid "Your selection? (enter `?' for more information): "
 msgstr "妳的選擇是? (輸入 `?' 以取得更多資訊): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:949
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2865,74 +2870,74 @@ msgstr ""
 "妳真的確定要用妳的金鑰 \"%s\" (%s)\n"
 "來簽署這把金鑰嗎\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:956
 msgid "This will be a self-signature.\n"
 msgstr "這將會是一份自我簽章.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:962
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:980
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "這份簽章會被標記成不可匯出.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:987
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "這份簽章會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:994
 msgid "I have not checked this key at all.\n"
 msgstr "我根本沒有檢查過這把金鑰.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:999
 msgid "I have checked this key casually.\n"
 msgstr "我隨意檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1004
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1014
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
-#: g10/keyedit.c:5013 g10/sign.c:351
+#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
+#: g10/keyedit.c:5011 g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "金鑰祇剩下殘骸或者祇含有卡上 (on-card) 金鑰項目 - 沒有可變更的密語.\n"
 
-#: g10/keyedit.c:1137 g10/keygen.c:3215
+#: g10/keyedit.c:1135 g10/keygen.c:3213
 msgid "This key is not protected.\n"
 msgstr "這把金鑰沒有被保護.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3203 g10/revoke.c:539
+#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分沒辦法取用.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3218
+#: g10/keyedit.c:1143 g10/keygen.c:3216
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上 (on-card).\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3222
+#: g10/keyedit.c:1147 g10/keygen.c:3220
 msgid "Key is protected.\n"
 msgstr "金鑰被保護了.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1171
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "無法編輯這把金鑰: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1177
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2940,11 +2945,11 @@ msgstr ""
 "輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1895
+#: g10/keyedit.c:1186 g10/keygen.c:1893
 msgid "passphrase not correctly repeated; try again"
 msgstr "密語再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1191
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2952,186 +2957,186 @@ msgstr ""
 "妳不想要用密語 - 這大概是個 *糟* 點子!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1194
 msgid "Do you really want to do this? (y/N) "
 msgstr "妳真的想要這麼做嗎? (y/N) "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1265
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把金鑰的簽章搬移到正確的位置去\n"
 
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "儲存並離開"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "顯示金鑰指紋"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "列出金鑰和使用者 ID"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "使用者 ID 選了 N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "選擇次鑰 N"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "檢查簽章"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "簽署所選的使用者 ID [* 請參見底下有關的註解]"
 
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs locally"
 msgstr "僅在本地簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a trust signature"
 msgstr "用信任簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1377
 msgid "add a user ID"
 msgstr "增加一個使用者 ID"
 
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1379
 msgid "add a photo ID"
 msgstr "增加一個照片 ID"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1381
 msgid "delete selected user IDs"
 msgstr "刪除所選的使用者 ID"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1386
 msgid "add a subkey"
 msgstr "增加一把次鑰"
 
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
 msgstr "加入某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
 msgstr "移動某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
 msgstr "移動某把備份金鑰至智慧卡"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1398
 msgid "delete selected subkeys"
 msgstr "刪除所選的次鑰"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1400
 msgid "add a revocation key"
 msgstr "增加一把撤銷金鑰"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1402
 msgid "delete signatures from the selected user IDs"
 msgstr "從所選的使用者 ID 中刪除簽章"
 
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1404
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "從金鑰或所選的次鑰中變更使用期限"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1406
 msgid "flag the selected user ID as primary"
 msgstr "把所選的使用者 ID 標為主要"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1408
 msgid "toggle between the secret and public key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1411
 msgid "list preferences (expert)"
 msgstr "列出偏好 (專家模式)"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1413
 msgid "list preferences (verbose)"
 msgstr "列出偏好 (囉唆模式)"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1415
 msgid "set preference list for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1420
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好金鑰伺服器 URL"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1422
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1424
 msgid "change the passphrase"
 msgstr "更改密語"
 
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1428
 msgid "change the ownertrust"
 msgstr "更改主觀信任"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1430
 msgid "revoke signatures on the selected user IDs"
 msgstr "從所選的使用者 ID 上撤銷簽章"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1432
 msgid "revoke selected user IDs"
 msgstr "撤銷所選的使用者 ID"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1437
 msgid "revoke key or selected subkeys"
 msgstr "撤銷金鑰或所選的次鑰"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1438
 msgid "enable key"
 msgstr "啟用金鑰"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1439
 msgid "disable key"
 msgstr "禁用金鑰"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1440
 msgid "show selected photo IDs"
 msgstr "顯示所選的照片 ID"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1566
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "讀取私鑰區塊 \"%s\" 時出錯: %s\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1584
 msgid "Secret key is available.\n"
 msgstr "私鑰可用.\n"
 
-#: g10/keyedit.c:1667
+#: g10/keyedit.c:1665
 msgid "Need the secret key to do this.\n"
 msgstr "要有私鑰纔能這麼做.\n"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1673
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "請先使用 \"toggle\" 指令.\n"
 
-#: g10/keyedit.c:1694
+#: g10/keyedit.c:1692
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3142,154 +3147,154 @@ msgstr ""
 "  加上 `t' 的話就是信任簽章 (tsign), 加上 `nr' 的話就是不可撤銷簽章\n"
 "  (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
 
-#: g10/keyedit.c:1734
+#: g10/keyedit.c:1732
 msgid "Key is revoked."
 msgstr "金鑰已經被撤銷了."
 
-#: g10/keyedit.c:1753
+#: g10/keyedit.c:1751
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1758
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示: 選擇使用者 ID 來加以簽署\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1767
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的簽章種類 `%s'\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1790
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允許使用這個指令.\n"
 
-#: g10/keyedit.c:1814 g10/keyedit.c:1834 g10/keyedit.c:2000
+#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "妳至少得選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:1816
+#: g10/keyedit.c:1814
 msgid "You can't delete the last user ID!\n"
 msgstr "妳不能刪除最後一個使用者 ID!\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1816
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1819
+#: g10/keyedit.c:1817
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1869
+#: g10/keyedit.c:1867
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要移動主要金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1879
 msgid "You must select exactly one key.\n"
 msgstr "妳一定祇得選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
 msgstr "這項指令應該要拿一個檔名當作參數\n"
 
-#: g10/keyedit.c:1923
+#: g10/keyedit.c:1921
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: g10/keyedit.c:1940
+#: g10/keyedit.c:1938
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "從 `%s' 讀取備份金鑰時發生錯誤: %s\n"
 
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
 msgstr "妳至少必須選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1965
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "妳真的想要刪除被選擇的金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1966
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "妳真的要刪除這把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2003
+#: g10/keyedit.c:2001
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要撤銷所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2004
+#: g10/keyedit.c:2002
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2022
+#: g10/keyedit.c:2020
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "妳真的想要撤銷這整把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2031
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "妳真的想要撤銷這些被選擇的次鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2035
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "妳真的想要撤銷這把次鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2085
+#: g10/keyedit.c:2083
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
 
-#: g10/keyedit.c:2127
+#: g10/keyedit.c:2125
 msgid "Set preference list to:\n"
 msgstr "設定偏好清單至:\n"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2131
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所選使用者 ID 的偏好嗎? (y/N) "
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2133
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新偏好嗎? (y/N) "
 
-#: g10/keyedit.c:2203
+#: g10/keyedit.c:2201
 msgid "Save changes? (y/N) "
 msgstr "要儲存變更嗎? (y/N) "
 
-#: g10/keyedit.c:2206
+#: g10/keyedit.c:2204
 msgid "Quit without saving? (y/N) "
 msgstr "要不儲存就離開嗎? (y/N) "
 
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2214
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: g10/keyedit.c:2223
+#: g10/keyedit.c:2221
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私鑰失敗: %s\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2228
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以不需要更新.\n"
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2329
 msgid "Digest: "
 msgstr "摘要: "
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2381
 msgid "Features: "
 msgstr "特點: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2392
 msgid "Keyserver no-modify"
 msgstr "金鑰伺服器無修改"
 
-#: g10/keyedit.c:2409 g10/keylist.c:308
+#: g10/keyedit.c:2407 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:2417 g10/keyedit.c:2418
+#: g10/keyedit.c:2415 g10/keyedit.c:2416
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3297,73 +3302,73 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/keyedit.c:2628
+#: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有偏好.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2685
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "這把金鑰已經在 %s 時被 %s 金鑰 %s 給撤銷了\n"
 
-#: g10/keyedit.c:2708
+#: g10/keyedit.c:2706
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰可能被 %s 金鑰 %s 撤銷了 "
 
-#: g10/keyedit.c:2714
+#: g10/keyedit.c:2712
 msgid "(sensitive)"
 msgstr "(機密的)"
 
-#: g10/keyedit.c:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
+#: g10/keylist.c:192 g10/keyserver.c:517
 #, c-format
 msgid "created: %s"
 msgstr "建立於: %s"
 
-#: g10/keyedit.c:2733 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:986
+#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990
 #, c-format
 msgid "revoked: %s"
 msgstr "已撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:2735 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "已過期: %s"
 
 #  of subkey
-#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:992
+#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
+#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
+#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996
 #, c-format
 msgid "expires: %s"
 msgstr "過期: %s"
 
-#: g10/keyedit.c:2739
+#: g10/keyedit.c:2737
 #, c-format
 msgid "usage: %s"
 msgstr "用法: %s"
 
-#: g10/keyedit.c:2754
+#: g10/keyedit.c:2752
 #, c-format
 msgid "trust: %s"
 msgstr "信任: %s"
 
-#: g10/keyedit.c:2758
+#: g10/keyedit.c:2756
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2763
 msgid "This key has been disabled"
 msgstr "這把金鑰已經被禁用了"
 
-#: g10/keyedit.c:2793 g10/keylist.c:200
+#: g10/keyedit.c:2791 g10/keylist.c:198
 msgid "card-no: "
 msgstr "卡片編號: "
 
-#: g10/keyedit.c:2817
+#: g10/keyedit.c:2815
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3371,17 +3376,17 @@ msgstr ""
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非妳重新執行程式.\n"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:521
-#: g10/mainproc.c:1804 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
+#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:525
-#: g10/mainproc.c:1806 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
+#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699
 msgid "expired"
 msgstr "已過期"
 
-#: g10/keyedit.c:2948
+#: g10/keyedit.c:2946
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3389,7 +3394,7 @@ msgstr ""
 "警告: 沒有任何使用者 ID 已被標示為主要 ID. 這項指令可能\n"
 "      會導致不同的使用者 ID 被當成主要 ID.\n"
 
-#: g10/keyedit.c:3009
+#: g10/keyedit.c:3007
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3398,74 +3403,74 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3014 g10/keyedit.c:3349
+#: g10/keyedit.c:3012 g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "妳確定仍然想要增加嗎? (y/N) "
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3018
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "妳不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這個完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3170
+#: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這個無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這個未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要刪除這個自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3195
+#: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
 msgstr "沒有東西被刪除.\n"
 
-#: g10/keyedit.c:3231 g10/trustdb.c:1703
+#: g10/keyedit.c:3229 g10/trustdb.c:1701
 msgid "invalid"
 msgstr "無效"
 
-#: g10/keyedit.c:3233
+#: g10/keyedit.c:3231
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
 
-#: g10/keyedit.c:3240
+#: g10/keyedit.c:3238
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/keyedit.c:3241
+#: g10/keyedit.c:3239
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3247
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
 
-#: g10/keyedit.c:3250
+#: g10/keyedit.c:3248
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3342
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3474,360 +3479,360 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3353
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "妳不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3373
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3398
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3413
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "妳不能指派某把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
 msgstr "這把金鑰已被指定為撤銷者了\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3454
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3460
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "妳確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3522
 msgid "Please remove selections from the secret keys.\n"
 msgstr "請從私鑰中移除選擇.\n"
 
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3528
 msgid "Please select at most one subkey.\n"
 msgstr "請至多選擇一把次鑰.\n"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3532
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更某把次鑰的使用期限.\n"
 
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3584
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "妳不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:3602
+#: g10/keyedit.c:3600
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/keyedit.c:3682
+#: g10/keyedit.c:3680
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "警告: 正要簽署的子鑰 %s 未經交叉認證\n"
 
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3850
+#: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
 msgstr "請精確地選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
+#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4058
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入妳的偏好金鑰伺服器 URL: "
 
-#: g10/keyedit.c:4140
+#: g10/keyedit.c:4138
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "妳確定要取代它嗎？ (y/N) "
 
-#: g10/keyedit.c:4141
+#: g10/keyedit.c:4139
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "妳確定要刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4201
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "簽章標記: "
 
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4350
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "是否覆寫? (y/N) "
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4414
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4474
+#: g10/keyedit.c:4472
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4499
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有對應到次鑰\n"
 
-#: g10/keyedit.c:4636
+#: g10/keyedit.c:4634
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被妳的金鑰 %s 於 %s%s%s 簽署了\n"
 
-#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
-#: g10/keyedit.c:4645
+#: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽署已經在 %s 過期了.\n"
 
-#: g10/keyedit.c:4649
+#: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "妳確定妳仍然想要撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4680
+#: g10/keyedit.c:4678
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "妳已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4704
 msgid " (non-revocable)"
 msgstr " (不可撤銷)"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4711
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被妳的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
 msgstr "妳正在撤銷這些簽章:\n"
 
-#: g10/keyedit.c:4755
+#: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4783
 msgid "no secret key\n"
 msgstr "沒有私鑰\n"
 
-#: g10/keyedit.c:4855
+#: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
 
-#: g10/keyedit.c:4872
+#: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 簽章的日期標記為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:4936
+#: g10/keyedit.c:4934
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:4998
+#: g10/keyedit.c:4996
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "次鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:5093
+#: g10/keyedit.c:5091
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
 
-#: g10/keygen.c:265
+#: g10/keygen.c:263
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "偏好設定 `%s' 重複了\n"
 
-#: g10/keygen.c:272
+#: g10/keygen.c:270
 msgid "too many cipher preferences\n"
 msgstr "編密偏好過多\n"
 
-#: g10/keygen.c:274
+#: g10/keygen.c:272
 msgid "too many digest preferences\n"
 msgstr "摘要偏好過多\n"
 
-#: g10/keygen.c:276
+#: g10/keygen.c:274
 msgid "too many compression preferences\n"
 msgstr "壓縮偏好過多\n"
 
-#: g10/keygen.c:401
+#: g10/keygen.c:399
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "偏好字串中含有無效的 `%s' 項目\n"
 
-#: g10/keygen.c:876
+#: g10/keygen.c:874
 msgid "writing direct signature\n"
 msgstr "正在寫入直接簽章\n"
 
-#: g10/keygen.c:915
+#: g10/keygen.c:913
 msgid "writing self signature\n"
 msgstr "正在寫入自我簽章\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 msgid "writing key binding signature\n"
 msgstr "正在寫入附鑰簽章\n"
 
-#: g10/keygen.c:1028 g10/keygen.c:1111 g10/keygen.c:1116 g10/keygen.c:1233
-#: g10/keygen.c:2776
+#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:2774
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/keygen.c:1033 g10/keygen.c:1122 g10/keygen.c:1238 g10/keygen.c:2782
+#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u 位元\n"
 
-#: g10/keygen.c:1331
+#: g10/keygen.c:1329
 msgid "Sign"
 msgstr "簽署"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1332
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1337
+#: g10/keygen.c:1335
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1338
 msgid "Authenticate"
 msgstr "鑑定"
 
-#: g10/keygen.c:1348
+#: g10/keygen.c:1346
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1367
+#: g10/keygen.c:1365
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 金鑰可能的動作: "
 
-#: g10/keygen.c:1371
+#: g10/keygen.c:1369
 msgid "Current allowed actions: "
 msgstr "目前可進行的動作: "
 
-#: g10/keygen.c:1376
+#: g10/keygen.c:1374
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 切換簽署性能\n"
 
-#: g10/keygen.c:1379
+#: g10/keygen.c:1377
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 切換加密性能\n"
 
-#: g10/keygen.c:1382
+#: g10/keygen.c:1380
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 切換鑑定性能\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1383
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1441
+#: g10/keygen.c:1439
 msgid "Please select what kind of key you want:\n"
 msgstr "請選擇妳要使用的金鑰種類:\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1441
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA 和 Elgamal (預設)\n"
 
-#: g10/keygen.c:1444
+#: g10/keygen.c:1442
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (僅能簽署用)\n"
 
-#: g10/keygen.c:1446
+#: g10/keygen.c:1444
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (妳自己設定性能)\n"
 
-#: g10/keygen.c:1448
+#: g10/keygen.c:1446
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (僅能加密用)\n"
 
-#: g10/keygen.c:1449
+#: g10/keygen.c:1447
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (僅能簽署用)\n"
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1449
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (僅能加密用)\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1451
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (妳自己設定性能)\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1520
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA 金鑰對會有 %u 位元長.\n"
 
-#: g10/keygen.c:1532
+#: g10/keygen.c:1530
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
 
-#: g10/keygen.c:1539
+#: g10/keygen.c:1537
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "妳想要用多大的金鑰尺寸? (%u) "
 
-#: g10/keygen.c:1553
+#: g10/keygen.c:1551
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1557
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "妳所要求的金鑰尺寸是 %u 位元\n"
 
-#: g10/keygen.c:1564 g10/keygen.c:1569
+#: g10/keygen.c:1562 g10/keygen.c:1567
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u 位元\n"
 
-#: g10/keygen.c:1618
+#: g10/keygen.c:1616
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3843,7 +3848,7 @@ msgstr ""
 "      <n>m = 金鑰在 n 月後會過期\n"
 "      <n>y = 金鑰在 n 年後會過期\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1627
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3859,38 +3864,38 @@ msgstr ""
 "      <n>m = 簽章在 n 月後會過期\n"
 "      <n>y = 簽章在 n 年後會過期\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1648
 msgid "Key is valid for? (0) "
 msgstr "金鑰的有效期限是多久? (0) "
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1653
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "簽章的有效期限是多久? (%s) "
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1671
 msgid "invalid value\n"
 msgstr "無效的數值\n"
 
-#: g10/keygen.c:1680
+#: g10/keygen.c:1678
 msgid "Key does not expire at all\n"
 msgstr "金鑰完全不會過期\n"
 
-#: g10/keygen.c:1681
+#: g10/keygen.c:1679
 msgid "Signature does not expire at all\n"
 msgstr "簽章完全不會過期\n"
 
-#: g10/keygen.c:1686
+#: g10/keygen.c:1684
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "金鑰將會在 %s 過期\n"
 
-#: g10/keygen.c:1687
+#: g10/keygen.c:1685
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "簽章將會在 %s 過期.\n"
 
-#: g10/keygen.c:1693
+#: g10/keygen.c:1691
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3898,11 +3903,11 @@ msgstr ""
 "妳的系統無法顯示 2038 年以後的日期.\n"
 "不過, 它可以正確處理直到 2106 年之前的年份.\n"
 
-#: g10/keygen.c:1698
+#: g10/keygen.c:1696
 msgid "Is this correct? (y/N) "
 msgstr "以上正確嗎? (y/N) "
 
-#: g10/keygen.c:1713
+#: g10/keygen.c:1711
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3917,44 +3922,44 @@ msgstr ""
 "    \"Ke-Huan Lin (Jedi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1724
 msgid "Real name: "
 msgstr "真實姓名: "
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1732
 msgid "Invalid character in name\n"
 msgstr "姓名含有無效的字符\n"
 
-#: g10/keygen.c:1736
+#: g10/keygen.c:1734
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用數字開頭\n"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1736
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五個字符長\n"
 
-#: g10/keygen.c:1746
+#: g10/keygen.c:1744
 msgid "Email address: "
 msgstr "電子郵件地址: "
 
-#: g10/keygen.c:1752
+#: g10/keygen.c:1750
 msgid "Not a valid email address\n"
 msgstr "不是有效的電子郵件地址\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1758
 msgid "Comment: "
 msgstr "註釋: "
 
-#: g10/keygen.c:1766
+#: g10/keygen.c:1764
 msgid "Invalid character in comment\n"
 msgstr "註釋含有無效的字符\n"
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1787
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "妳正在使用 `%s' 字元集.\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1793
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3965,7 +3970,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1800
+#: g10/keygen.c:1798
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
 
@@ -3980,23 +3985,23 @@ msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:1816
+#: g10/keygen.c:1814
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1824
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 
-#: g10/keygen.c:1827
+#: g10/keygen.c:1825
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:1846
+#: g10/keygen.c:1844
 msgid "Please correct the error first\n"
 msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:1886
+#: g10/keygen.c:1884
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4004,12 +4009,12 @@ msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:1896 g10/passphrase.c:810
+#: g10/keygen.c:1894 g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1900
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4021,7 +4026,7 @@ msgstr ""
 "僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
 "\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1922
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4032,50 +4037,50 @@ msgstr ""
 "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
 
-#: g10/keygen.c:2722
+#: g10/keygen.c:2720
 msgid "Key generation canceled.\n"
 msgstr "已取消金鑰產生.\n"
 
-#: g10/keygen.c:2921 g10/keygen.c:3068
+#: g10/keygen.c:2919 g10/keygen.c:3066
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在將公鑰寫至 `%s'\n"
 
-#: g10/keygen.c:2923 g10/keygen.c:3071
+#: g10/keygen.c:2921 g10/keygen.c:3069
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "正在寫入私鑰 stub 至 `%s'\n"
 
-#: g10/keygen.c:2926 g10/keygen.c:3074
+#: g10/keygen.c:2924 g10/keygen.c:3072
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在將私鑰寫至 `%s'\n"
 
-#: g10/keygen.c:3057
+#: g10/keygen.c:3055
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可寫的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3063
+#: g10/keygen.c:3061
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可寫的私鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3081
+#: g10/keygen.c:3079
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3086
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "寫入私鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:3111
+#: g10/keygen.c:3109
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和私鑰已經被建立及簽署了.\n"
 
-#: g10/keygen.c:3122
+#: g10/keygen.c:3120
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4083,698 +4088,698 @@ msgstr ""
 "請注意這把金鑰不能用於加密之用.  也許妳會想藉由 \"--edit-key\" \n"
 "指令來產生加密用的次鑰.\n"
 
-#: g10/keygen.c:3134 g10/keygen.c:3263 g10/keygen.c:3378
+#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:276
+#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3315 g10/sign.c:278
+#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3326
+#: g10/keygen.c:3195 g10/keygen.c:3324
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 
-#: g10/keygen.c:3236 g10/keygen.c:3359
+#: g10/keygen.c:3234 g10/keygen.c:3357
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
-#: g10/keygen.c:3524
+#: g10/keygen.c:3522
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "儲存金鑰到卡片上時失敗: %s\n"
 
-#: g10/keygen.c:3571
+#: g10/keygen.c:3569
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: g10/keygen.c:3597
+#: g10/keygen.c:3595
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
 msgid "never     "
 msgstr "永遠不過期"
 
-#: g10/keylist.c:265
+#: g10/keylist.c:263
 msgid "Critical signature policy: "
 msgstr "關鍵簽章原則: "
 
-#: g10/keylist.c:267
+#: g10/keylist.c:265
 msgid "Signature policy: "
 msgstr "簽章原則: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:304
 msgid "Critical preferred keyserver: "
 msgstr "執意偏好的金鑰伺服器: "
 
-#: g10/keylist.c:359
+#: g10/keylist.c:357
 msgid "Critical signature notation: "
 msgstr "關鍵簽章標記: "
 
-#: g10/keylist.c:361
+#: g10/keylist.c:359
 msgid "Signature notation: "
 msgstr "簽章標記: "
 
-#: g10/keylist.c:471
+#: g10/keylist.c:469
 msgid "Keyring"
 msgstr "鑰匙圈"
 
-#: g10/keylist.c:1505
+#: g10/keylist.c:1503
 msgid "Primary key fingerprint:"
 msgstr "               主鑰指紋:"
 
-#: g10/keylist.c:1507
+#: g10/keylist.c:1505
 msgid "     Subkey fingerprint:"
 msgstr "               子鑰指紋:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1514
+#: g10/keylist.c:1512
 msgid " Primary key fingerprint:"
 msgstr "                主鑰指紋:"
 
-#: g10/keylist.c:1516
+#: g10/keylist.c:1514
 msgid "      Subkey fingerprint:"
 msgstr "                子鑰指紋:"
 
 #  use tty
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1518 g10/keylist.c:1522
 msgid "      Key fingerprint ="
 msgstr "      金鑰指紋 ="
 
-#: g10/keylist.c:1591
+#: g10/keylist.c:1589
 msgid "      Card serial no. ="
 msgstr "      卡片序號 ="
 
-#: g10/keyring.c:1246
+#: g10/keyring.c:1244
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "把 `%s' 重新新命成 `%s' 時失敗: %s\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1250
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "警告: 2 個檔案存在有互相矛盾的資訊.\n"
 
-#: g10/keyring.c:1254
+#: g10/keyring.c:1252
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s 是沒有改變的那一個\n"
 
-#: g10/keyring.c:1255
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s 是新的那一個\n"
 
-#: g10/keyring.c:1256
+#: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
 msgstr "請修補這個可能的安全性裂縫\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1374
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "正在快取鑰匙圈 `%s'\n"
 
-#: g10/keyring.c:1422
+#: g10/keyring.c:1420
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "目前檢查了 %lu 份金鑰 (共 %lu 份簽章)\n"
 
-#: g10/keyring.c:1434
+#: g10/keyring.c:1432
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "檢查了 %lu 份金鑰 (共 %lu 份簽章)\n"
 
-#: g10/keyring.c:1505
+#: g10/keyring.c:1503
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: 鑰匙圈已建立\n"
 
-#: g10/keyserver.c:61
+#: g10/keyserver.c:67
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:62
+#: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:64
+#: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:66
+#: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:70
+#: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:72
+#: g10/keyserver.c:78
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "請輸入妳的偏好金鑰伺服器 URL: "
 
-#: g10/keyserver.c:74
+#: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr ""
 
-#: g10/keyserver.c:140
+#: g10/keyserver.c:146
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "警告: 金鑰伺服器選項 `%s' 並未用於此平台\n"
 
-#: g10/keyserver.c:523
+#: g10/keyserver.c:529
 msgid "disabled"
 msgstr "已禁用"
 
-#: g10/keyserver.c:724
+#: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "請輸入數字, N)ext, 或 Q)uit > "
 
-#: g10/keyserver.c:808 g10/keyserver.c:1426
+#: g10/keyserver.c:814 g10/keyserver.c:1432
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "無效的金鑰伺服器協定 (我們用 %d != 經手程式 %d)\n"
 
-#: g10/keyserver.c:906
+#: g10/keyserver.c:912
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
 
-#: g10/keyserver.c:908
+#: g10/keyserver.c:914
 msgid "key not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰\n"
 
-#: g10/keyserver.c:1145
+#: g10/keyserver.c:1151
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1155
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "正在請求金鑰 %s 自 %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1179
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1176
+#: g10/keyserver.c:1182
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1329
+#: g10/keyserver.c:1335
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "遞送金鑰 %s 至 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1333
+#: g10/keyserver.c:1339
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "遞送金鑰 %s 至 %s\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1382
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1386 g10/keyserver.c:1482
+#: g10/keyserver.c:1392 g10/keyserver.c:1488
 msgid "no keyserver action!\n"
 msgstr "沒有金鑰伺服器動作!\n"
 
-#: g10/keyserver.c:1434
+#: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告: 金鑰伺服器經手程式 (handler) 係來自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1443
+#: g10/keyserver.c:1449
 msgid "keyserver did not send VERSION\n"
 msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
 
-#: g10/keyserver.c:1505 g10/keyserver.c:2033
+#: g10/keyserver.c:1511 g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 
-#: g10/keyserver.c:1511
+#: g10/keyserver.c:1517
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "本版並不支援外部金鑰伺服器叫用\n"
 
-#: g10/keyserver.c:1523
+#: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "沒有金鑰伺服器方案 (scheme) `%s' 的經手程式 (handler)\n"
 
-#: g10/keyserver.c:1528
+#: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "動作 `%s' 並未被金鑰伺服器方案 (scheme) `%s' 所支援\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s 並不支援經手程式 (handler) 版本 %d\n"
 
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1549
 msgid "keyserver timed out\n"
 msgstr "金鑰伺服器逾時\n"
 
-#: g10/keyserver.c:1548
+#: g10/keyserver.c:1554
 msgid "keyserver internal error\n"
 msgstr "金鑰伺服器內部出錯\n"
 
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1563
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "金鑰伺服器通訊出錯: %s\n"
 
-#: g10/keyserver.c:1582 g10/keyserver.c:1616
+#: g10/keyserver.c:1588 g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並非金鑰 ID: 正跳過\n"
 
-#: g10/keyserver.c:1875
+#: g10/keyserver.c:1881
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "正從 %s 更新 1 份金鑰\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1905
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "正在更新 %d 份金鑰自 %s\n"
 
-#: g10/keyserver.c:1955
+#: g10/keyserver.c:1961
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1961
+#: g10/keyserver.c:1967
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/mainproc.c:239
+#: g10/mainproc.c:243
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:294
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密過的階段金鑰\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密語係以未知的摘要演算法 %d 所產生\n"
 
-#: g10/mainproc.c:381
+#: g10/mainproc.c:385
 #, c-format
 msgid "public key is %s\n"
 msgstr "公鑰為 %s\n"
 
-#: g10/mainproc.c:438
+#: g10/mainproc.c:442
 msgid "public key encrypted data: good DEK\n"
 msgstr "公鑰加密過的資料: 完好的 DEK\n"
 
-#: g10/mainproc.c:471
+#: g10/mainproc.c:475
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 加密了\n"
 
-#: g10/mainproc.c:475 g10/pkclist.c:219
+#: g10/mainproc.c:479 g10/pkclist.c:220
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "已用 %s 金鑰, ID %s 加密了\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:497
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公鑰解密失敗: %s\n"
 
-#: g10/mainproc.c:507
+#: g10/mainproc.c:511
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "已用 %lu 個密語加密了\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:513
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:540 g10/mainproc.c:562
+#: g10/mainproc.c:544 g10/mainproc.c:566
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 為加密過的資料\n"
 
-#: g10/mainproc.c:548
+#: g10/mainproc.c:552
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:584
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:588
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告: 訊息未受到完整的保護\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:601
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告: 加密過的訊息已經被變造了!\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:607
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:624
+#: g10/mainproc.c:628
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "請注意: 寄件者要求了 \"妳應該祇用眼睛看\"\n"
 
-#: g10/mainproc.c:626
+#: g10/mainproc.c:630
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始的檔名 ='%.*s'\n"
 
-#: g10/mainproc.c:711
+#: g10/mainproc.c:715
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:839
+#: g10/mainproc.c:843
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1191
 #, fuzzy
 msgid "no signature found\n"
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1430
+#: g10/mainproc.c:1434
 msgid "signature verification suppressed\n"
 msgstr "簽章驗證已被抑制\n"
 
-#: g10/mainproc.c:1539
+#: g10/mainproc.c:1543
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "無法處理這些多重簽章\n"
 
-#: g10/mainproc.c:1550
+#: g10/mainproc.c:1554
 #, c-format
 msgid "Signature made %s\n"
 msgstr "由 %s 建立的簽章\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1555
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               使用 %s 金鑰 %s\n"
 
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1559
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
-#: g10/mainproc.c:1575
+#: g10/mainproc.c:1579
 msgid "Key available at: "
 msgstr "可用的金鑰於: "
 
-#: g10/mainproc.c:1708 g10/mainproc.c:1756
+#: g10/mainproc.c:1712 g10/mainproc.c:1760
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*損壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1710 g10/mainproc.c:1758
+#: g10/mainproc.c:1714 g10/mainproc.c:1762
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "過期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1712 g10/mainproc.c:1760
+#: g10/mainproc.c:1716 g10/mainproc.c:1764
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1764
+#: g10/mainproc.c:1768
 msgid "[uncertain]"
 msgstr "[ 不確定 ]"
 
-#: g10/mainproc.c:1797
+#: g10/mainproc.c:1801
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦即 \"%s\""
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "這份簽署已經在 %s 過期了\n"
 
-#: g10/mainproc.c:1900
+#: g10/mainproc.c:1904
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "這份簽署在 %s 過期\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1907
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: g10/mainproc.c:1904
+#: g10/mainproc.c:1908
 msgid "binary"
 msgstr "二進制"
 
-#: g10/mainproc.c:1905
+#: g10/mainproc.c:1909
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:1905 g10/trustdb.c:531
+#: g10/mainproc.c:1909 g10/trustdb.c:529
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1925
+#: g10/mainproc.c:1929
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:1994 g10/mainproc.c:2010 g10/mainproc.c:2096
+#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100
 msgid "not a detached signature\n"
 msgstr "不是一份分離的簽章\n"
 
-#: g10/mainproc.c:2037
+#: g10/mainproc.c:2041
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 
-#: g10/mainproc.c:2045
+#: g10/mainproc.c:2049
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等級 0x%02x 的獨立簽章\n"
 
-#: g10/mainproc.c:2102
+#: g10/mainproc.c:2106
 msgid "old style (PGP 2.x) signature\n"
 msgstr "舊型 (PGP 2.x) 簽章\n"
 
-#: g10/mainproc.c:2112
+#: g10/mainproc.c:2116
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 
-#: g10/misc.c:122
+#: g10/misc.c:120
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "無法讓系統停止傾印核心檔: %s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "`%s' 的 fstat 失敗於 %s: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:205
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) 失敗於 %s: %s\n"
 
-#: g10/misc.c:316
+#: g10/misc.c:314
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "警告: 正在使用實驗性的公鑰演算法 %s\n"
 
-#: g10/misc.c:331
+#: g10/misc.c:329
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "警告: 正在使用實驗性的編密演算法 %s\n"
 
-#: g10/misc.c:346
+#: g10/misc.c:344
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "警告: 正在使用實驗性的摘要演算法 %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:349
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告: 摘要演算法 %s 已不建議使用\n"
 
-#: g10/misc.c:447
+#: g10/misc.c:445
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 編密法外掛模組不存在\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
+#: g10/misc.c:446 g10/sig-check.c:101
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
 
-#: g10/misc.c:681
+#: g10/misc.c:679
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
 
-#: g10/misc.c:685
+#: g10/misc.c:683
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告: \"%s\" 選項已不建議使用\n"
 
-#: g10/misc.c:687
+#: g10/misc.c:685
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "請改以 \"%s%s\" 代替\n"
 
-#: g10/misc.c:694
+#: g10/misc.c:692
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告: \"%s\" 是個被反對使用的指令 - 別再用了\n"
 
-#: g10/misc.c:707
+#: g10/misc.c:705
 msgid "Uncompressed"
 msgstr "未被壓縮"
 
-#: g10/misc.c:732
+#: g10/misc.c:730
 msgid "uncompressed|none"
 msgstr "uncompressed|none|未被壓縮|無"
 
-#: g10/misc.c:842
+#: g10/misc.c:857
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "這個訊息對 %s 來說無法使用\n"
 
-#: g10/misc.c:1017
+#: g10/misc.c:1032
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "不明確的選項 `%s'\n"
 
-#: g10/misc.c:1042
+#: g10/misc.c:1057
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的選項 `%s'\n"
 
-#: g10/openfile.c:86
+#: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
 msgstr "檔案 `%s' 存在. "
 
-#: g10/openfile.c:90
+#: g10/openfile.c:92
 msgid "Overwrite? (y/N) "
 msgstr "是否覆寫? (y/N) "
 
-#: g10/openfile.c:123
+#: g10/openfile.c:125
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: 未知的副檔名\n"
 
-#: g10/openfile.c:145
+#: g10/openfile.c:147
 msgid "Enter new filename"
 msgstr "請輸入新的檔名"
 
-#: g10/openfile.c:190
+#: g10/openfile.c:192
 msgid "writing to stdout\n"
 msgstr "正在寫入到標準輸出\n"
 
-#: g10/openfile.c:311
+#: g10/openfile.c:319
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "假設被簽署的資料在 `%s'\n"
 
-#: g10/openfile.c:390
+#: g10/openfile.c:398
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "新的設定檔 `%s' 被建立了\n"
 
-#: g10/openfile.c:392
+#: g10/openfile.c:400
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "警告: 在 `%s' 裡的選項於這次執行期間並沒有被啟用\n"
 
-#: g10/openfile.c:424
+#: g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "目錄 `%s' 已建立\n"
 
-#: g10/parse-packet.c:143
+#: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "無法操作公開金鑰演算法 %d\n"
 
-#: g10/parse-packet.c:713
+#: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告: 以可能並不安全的對稱式加密過的階段金鑰\n"
 
-#: g10/parse-packet.c:1164
+#: g10/parse-packet.c:1198
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的子封包設定了關鍵位元\n"
 
-#: g10/passphrase.c:310
+#: g10/passphrase.c:308
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: g10/passphrase.c:326
+#: g10/passphrase.c:324
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:343
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent 協定版本 %d 未被支援\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:360
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "代理程式的問題 - 正在停用代理程式\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:530 g10/passphrase.c:912
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主要金鑰 ID %s)"
 
-#: g10/passphrase.c:546
+#: g10/passphrase.c:544
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4785,27 +4790,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u 位元長的 %s 金鑰, ID %s, 建立於 %s%s\n"
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:569
 msgid "Repeat passphrase\n"
 msgstr "請再輸入一次密語\n"
 
-#: g10/passphrase.c:573
+#: g10/passphrase.c:571
 msgid "Enter passphrase\n"
 msgstr "請輸入密語\n"
 
-#: g10/passphrase.c:649
+#: g10/passphrase.c:647
 msgid "cancelled by user\n"
 msgstr "由使用者取消了\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:974
+#: g10/passphrase.c:803 g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr "無法在批次模式中查詢密語\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:979
+#: g10/passphrase.c:810 g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "請輸入密語: "
 
-#: g10/passphrase.c:895
+#: g10/passphrase.c:893
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4814,21 +4819,21 @@ msgstr ""
 "妳需要用密語來解開下列使用者的\n"
 "私鑰: \"%s\"\n"
 
-#: g10/passphrase.c:901
+#: g10/passphrase.c:899
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位元長的 %s 金鑰, ID %s, 建立於 %s"
 
-#: g10/passphrase.c:910
+#: g10/passphrase.c:908
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (在主鑰 ID %s 上的子鑰)"
 
-#: g10/passphrase.c:987
+#: g10/passphrase.c:985
 msgid "Repeat passphrase: "
 msgstr "請再輸入一次密語: "
 
-#: g10/photoid.c:73
+#: g10/photoid.c:71
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -4842,116 +4847,116 @@ msgstr ""
 "妳的金鑰也會變成非常地大!\n"
 "盡量把圖片尺寸控制在 240x288 左右, 會是個非常理想的大小.\n"
 
-#: g10/photoid.c:95
+#: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
 msgstr "輸入要當作相片 ID 的 JPEG 檔名: "
 
-#: g10/photoid.c:116
+#: g10/photoid.c:114
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "無法開啟 JPEG 圖檔 `%s': %s\n"
 
-#: g10/photoid.c:127
+#: g10/photoid.c:125
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "這個 JPEG 檔案真的很大 (%d 位元組) !\n"
 
-#: g10/photoid.c:129
+#: g10/photoid.c:127
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "妳確定要用它嗎? (y/N) "
 
-#: g10/photoid.c:146
+#: g10/photoid.c:144
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "`%s' 不是一個 JPEG 圖檔\n"
 
-#: g10/photoid.c:165
+#: g10/photoid.c:163
 msgid "Is this photo correct (y/N/q)? "
 msgstr "這張照片正確嗎? (y/N/q) "
 
-#: g10/photoid.c:329
+#: g10/photoid.c:327
 msgid "no photo viewer set\n"
 msgstr ""
 
-#: g10/photoid.c:383
+#: g10/photoid.c:381
 msgid "unable to display photo ID!\n"
 msgstr "無法顯示照片 ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:63 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:65 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "金鑰被代換了"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:67 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "金鑰已經被洩漏了"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:69 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "金鑰不再被使用了"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:71 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "使用者 ID 不再有效了"
 
-#: g10/pkclist.c:74
+#: g10/pkclist.c:75
 msgid "reason for revocation: "
 msgstr "撤銷原因: "
 
-#: g10/pkclist.c:91
+#: g10/pkclist.c:92
 msgid "revocation comment: "
 msgstr "撤銷註釋: "
 
 #  a string with valid answers
-#: g10/pkclist.c:206
+#: g10/pkclist.c:207
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:214
+#: g10/pkclist.c:215
 msgid "No trust value assigned to:\n"
 msgstr "下列項目沒有對應的信任值:\n"
 
-#: g10/pkclist.c:246
+#: g10/pkclist.c:247
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  亦即 \"%s\"\n"
 
-#: g10/pkclist.c:256
+#: g10/pkclist.c:257
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "妳有多信任這把金鑰真的屬於叫這個名字的使用者?\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr " %d = 我不知道或不想說\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:274
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = 我*不*信任\n"
 
-#: g10/pkclist.c:279
+#: g10/pkclist.c:280
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = 我徹底信任\n"
 
-#: g10/pkclist.c:285
+#: g10/pkclist.c:286
 msgid "  m = back to the main menu\n"
 msgstr " m = 回到主選單\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:289
 msgid "  s = skip this key\n"
 msgstr " s = 跳過這把金鑰\n"
 
-#: g10/pkclist.c:289
+#: g10/pkclist.c:290
 msgid "  q = quit\n"
 msgstr "  q = 離開\n"
 
-#: g10/pkclist.c:293
+#: g10/pkclist.c:294
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -4960,37 +4965,37 @@ msgstr ""
 "這把金鑰的最小信任等級為: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:300 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "妳的決定是甚麼? "
 
-#: g10/pkclist.c:320
+#: g10/pkclist.c:321
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "請問妳是否真的想把這把金鑰設成徹底信任呢? (y/N) "
 
-#: g10/pkclist.c:334
+#: g10/pkclist.c:335
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "被徹底信任金鑰的憑證:\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr "%s: 沒法保證這把金鑰真的屬於叫這個名字的使用者\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:425
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr "%s: 祇能有限的保證這把金鑰真的屬於叫這個名字的使用者\n"
 
-#: g10/pkclist.c:430
+#: g10/pkclist.c:431
 msgid "This key probably belongs to the named user\n"
 msgstr "這把金鑰很可能屬於叫這個名字的使用者\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid "This key belongs to us\n"
 msgstr "這把金鑰是屬於我們自己的\n"
 
-#: g10/pkclist.c:461
+#: g10/pkclist.c:462
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5000,105 +5005,105 @@ msgstr ""
 "除非妳 **真的** 知道自己在做甚麼,\n"
 "否則妳最好在下一個問題回答 no\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:469
 msgid "Use this key anyway? (y/N) "
 msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
 msgid "WARNING: Using untrusted key!\n"
 msgstr "警告: 正在使用不被信任的金鑰!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "警告: 這把金鑰可能已被撤銷了 (撤銷金鑰未出現)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "警告: 這把金鑰已經被它的指定撤銷者給撤銷了!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "警告: 這把金鑰已經被它的持有人撤銷了!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:523
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         這很有可能表示這個簽章是被偽造的.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "警告: 這把子鑰已經被它的持有人撤銷了!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
 msgstr "請注意: 這把金鑰已經被禁用了.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
 msgstr "請注意: 這把金鑰已經過期了!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:603
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:605
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         沒有證據指出這個簽章屬於這個持有者.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:613
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "警告: 我們 *不* 信任這把金鑰!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:614
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         這個簽章很有可能是 *偽造的*.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:622
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         這份簽章並不屬於這個持有者\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: 已跳過: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:835 g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳過: 公鑰已經存在了\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "妳沒有指定一個使用者 ID. (妳可能得用 \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Current recipients:\n"
 msgstr "目前的收件者:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:936
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5106,166 +5111,166 @@ msgstr ""
 "\n"
 "輸入使用者 ID. 以空白列結束: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:961
 msgid "No such user ID.\n"
 msgstr "沒有這個使用者 ID.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:970 g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
 msgstr "公鑰被禁用了.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
 msgstr "已跳過: 公鑰已經被設過了\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1035
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "未知的預設收件者 \"%s\"\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: 已跳過: 公鑰已經被禁用了\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1155
 msgid "no valid addressees\n"
 msgstr "沒有有效的地址\n"
 
-#: g10/plaintext.c:97
+#: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存它們\n"
 
-#: g10/plaintext.c:141 g10/plaintext.c:146 g10/plaintext.c:164
+#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立 `%s' 時發生錯誤: %s\n"
 
-#: g10/plaintext.c:463
+#: g10/plaintext.c:461
 msgid "Detached signature.\n"
 msgstr "分離的簽章.\n"
 
-#: g10/plaintext.c:469
+#: g10/plaintext.c:467
 msgid "Please enter name of data file: "
 msgstr "請輸入資料檔的名稱: "
 
-#: g10/plaintext.c:501
+#: g10/plaintext.c:499
 msgid "reading stdin ...\n"
 msgstr "正在從標準輸入讀取 ...\n"
 
-#: g10/plaintext.c:535
+#: g10/plaintext.c:533
 msgid "no signed data\n"
 msgstr "沒有被簽署過的資料\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:547
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "無法開啟被簽署過的資料 `%s'\n"
 
-#: g10/pubkey-enc.c:104
+#: g10/pubkey-enc.c:102
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "匿名收件者; 正在嘗試使用私鑰 %s ...\n"
 
-#: g10/pubkey-enc.c:135
+#: g10/pubkey-enc.c:133
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "很好, 我們就是匿名收件者.\n"
 
-#: g10/pubkey-enc.c:223
+#: g10/pubkey-enc.c:221
 msgid "old encoding of the DEK is not supported\n"
 msgstr "不支援舊式的 DEK 編碼\n"
 
-#: g10/pubkey-enc.c:244
+#: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "編密演算法 %d%s 未知或已停用了\n"
 
-#: g10/pubkey-enc.c:282
+#: g10/pubkey-enc.c:280
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "警告: 收件者偏好設定中找不到編密演算法 %s\n"
 
-#: g10/pubkey-enc.c:302
+#: g10/pubkey-enc.c:300
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "請注意: 私鑰 %s 在 %s 過期了\n"
 
-#: g10/pubkey-enc.c:308
+#: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
 msgstr "請注意: 金鑰已經被撤銷了"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失敗: %s\n"
 
-#: g10/revoke.c:147
+#: g10/revoke.c:145
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "金鑰 %s 沒有使用者 ID\n"
 
-#: g10/revoke.c:308
+#: g10/revoke.c:306
 msgid "To be revoked by:\n"
 msgstr "將被撤銷:\n"
 
-#: g10/revoke.c:312
+#: g10/revoke.c:310
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(這是把機密的撤銷金鑰)\n"
 
-#: g10/revoke.c:316
+#: g10/revoke.c:314
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:327 g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:342 g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失敗: %s\n"
 
-#: g10/revoke.c:407
+#: g10/revoke.c:405
 msgid "Revocation certificate created.\n"
 msgstr "已建立撤銷憑證.\n"
 
-#: g10/revoke.c:413
+#: g10/revoke.c:411
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:469
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找不到私鑰 \"%s\": %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:498
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "沒有相對應的公鑰: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:509
 msgid "public key does not match secret key!\n"
 msgstr "公鑰與私鑰並不吻合!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:516
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "要為這把金鑰建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:533
 msgid "unknown protection algorithm\n"
 msgstr "未知的保護演算法\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
 msgstr "注意: 這把金鑰沒有被保護!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:592
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5284,243 +5289,227 @@ msgstr ""
 "但是千萬小心: 妳的機器上的列印系統可能會在列印過\n"
 "程中把這些資料暫存在某個其他人也能夠看得到的地方!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:633
 msgid "Please select the reason for the revocation:\n"
 msgstr "請選擇撤銷的原因:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:643
 msgid "Cancel"
 msgstr "取消"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:645
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(也許妳會想要在這裡選擇 %d)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:686
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "請輸入選用的描述; 以空白列結束:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:714
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "撤銷原因: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:716
 msgid "(No description given)\n"
 msgstr "(沒有給定描述)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:721
 msgid "Is this okay? (y/N) "
 msgstr "這樣可以嗎? (y/N) "
 
-#: g10/seckey-cert.c:55
+#: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: g10/seckey-cert.c:61
+#: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "保護演算法 %d%s 未被支援\n"
 
-#: g10/seckey-cert.c:72
+#: g10/seckey-cert.c:70
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "保護摘要 %d 未被支援\n"
 
-#: g10/seckey-cert.c:266
+#: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
 msgstr "無效的密語; 請再試一次"
 
-#: g10/seckey-cert.c:267
+#: g10/seckey-cert.c:265
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:328
+#: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "警告: 偵測到金鑰薄弱 - 請再更換密語一次.\n"
 
-#: g10/seckey-cert.c:366
+#: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "正在產生私鑰保護會用到的舊式 16 位元加總檢查\n"
 
-#: g10/seskey.c:54
+#: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "建立了弱金鑰 - 正在重試\n"
 
-#: g10/seskey.c:59
+#: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "無法避免對稱式編密法的弱金鑰; 已經試了 %d 次了!\n"
 
-#: g10/seskey.c:222
+#: g10/seskey.c:220
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr ""
 
-#: g10/seskey.c:236
+#: g10/seskey.c:234
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr ""
 
-#: g10/seskey.c:248
+#: g10/seskey.c:246
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr ""
 
-#: g10/sig-check.c:76
+#: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "警告: 簽章摘要與訊息不一致\n"
 
-#: g10/sig-check.c:101
+#: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "警告: 正要簽署的子鑰 %s 未經交叉認證\n"
 
-#: g10/sig-check.c:113
+#: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "警告: 正要簽署的子鑰 %s 有無效的交叉憑證\n"
 
-#: g10/sig-check.c:181
+#: g10/sig-check.c:179
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "公鑰 %s 比簽章還要新了 %lu 秒\n"
 
-#: g10/sig-check.c:182
+#: g10/sig-check.c:180
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "公鑰 %s 比簽章還要新了 %lu 秒\n"
 
-#: g10/sig-check.c:193
+#: g10/sig-check.c:191
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "金鑰 %s 已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:193
 #, c-format
 msgid ""
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "金鑰 %s 已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:203
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "請注意: 簽章金鑰 %s 已於 %s 過期\n"
 
-#: g10/sig-check.c:287
+#: g10/sig-check.c:285
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假設金鑰 %s 的損壞簽章導因於某個未知的關鍵位元\n"
 
-#: g10/sig-check.c:544
+#: g10/sig-check.c:542
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供子鑰撤銷簽章使用\n"
 
-#: g10/sig-check.c:570
+#: g10/sig-check.c:568
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
 
-#: g10/sign.c:85
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入標記資料\n"
-
-#: g10/sign.c:93
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入標記資料\n"
-
-#: g10/sign.c:107
+#: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "警告: 標記 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:124
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入原則 URL\n"
-
-#: g10/sign.c:132
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入原則 URL\n"
-
-#: g10/sign.c:145
+#: g10/sign.c:116
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告: 原則 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:173
+#: g10/sign.c:139
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:346
+#: g10/sign.c:312
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: g10/sign.c:355
+#: g10/sign.c:321
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 簽章來自: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:756
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做分離簽署\n"
 
-#: g10/sign.c:862
+#: g10/sign.c:830
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
-#: g10/sign.c:988
+#: g10/sign.c:956
 msgid "signing:"
 msgstr "簽署:"
 
-#: g10/sign.c:1101
+#: g10/sign.c:1069
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做明文簽署\n"
 
-#: g10/sign.c:1280
+#: g10/sign.c:1248
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"
 
-#: g10/skclist.c:128 g10/skclist.c:192
+#: g10/skclist.c:126 g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
 
-#: g10/skclist.c:159
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "已跳過 \"%s\": 重複了\n"
 
-#: g10/skclist.c:167 g10/skclist.c:177 g10/skclist.c:186
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳過 \"%s\": %s\n"
 
-#: g10/skclist.c:172
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "已跳過: 私鑰已經存在\n"
 
-#: g10/skclist.c:187
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:58 g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
 
-#: g10/tdbdump.c:105
+#: g10/tdbdump.c:103
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -5529,340 +5518,340 @@ msgstr ""
 "# 相對應的信任值清單被建立於 %s\n"
 "# (請用 \"gpg --import-ownertrust\" 來取回它們)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "在 `%s' 中出錯: %s\n"
 
-#: g10/tdbdump.c:160
+#: g10/tdbdump.c:158
 msgid "line too long"
 msgstr "列太長"
 
-#: g10/tdbdump.c:168
+#: g10/tdbdump.c:166
 msgid "colon missing"
 msgstr "冒號缺漏"
 
-#: g10/tdbdump.c:174
+#: g10/tdbdump.c:172
 msgid "invalid fingerprint"
 msgstr "無效的指紋"
 
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:177
 msgid "ownertrust value missing"
 msgstr "主觀信任值缺漏"
 
-#: g10/tdbdump.c:215
+#: g10/tdbdump.c:213
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 
-#: g10/tdbdump.c:219
+#: g10/tdbdump.c:217
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "讀取 `%s' 錯誤: %s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:226 g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任資料庫: 同步化失敗: %s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:127 g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任資料庫記錄 %lu: 本地搜尋失敗: %s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:133 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
 
-#: g10/tdbio.c:245
+#: g10/tdbio.c:243
 msgid "trustdb transaction too large\n"
 msgstr "信任資料庫更動量過大\n"
 
-#: g10/tdbio.c:498
+#: g10/tdbio.c:496
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "無法存取 `%s': %s\n"
 
-#: g10/tdbio.c:513
+#: g10/tdbio.c:511
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: 目錄不存在!\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "無法為 `%s' 建立鎖定\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:523 g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "無法鎖定 `%s'\n"
 
-#: g10/tdbio.c:551
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: 建立版本記錄失敗: %s"
 
-#: g10/tdbio.c:555
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: 建立了無效的信任資料庫\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:556
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: 建立了信任資料庫\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:600
 msgid "NOTE: trustdb not writable\n"
 msgstr "請注意: 信任資料庫不可寫入\n"
 
-#: g10/tdbio.c:619
+#: g10/tdbio.c:617
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: 無效的信任資料庫\n"
 
-#: g10/tdbio.c:651
+#: g10/tdbio.c:649
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: 建立雜湊表失敗: %s\n"
 
-#: g10/tdbio.c:659
+#: g10/tdbio.c:657
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: 更新版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
+#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: 讀取版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:735
+#: g10/tdbio.c:733
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: 寫入版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:1174
+#: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信任資料庫: 本地搜尋失敗: %s\n"
 
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1180
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信任資料庫: 讀取失敗 (n=%d): %s\n"
 
-#: g10/tdbio.c:1203
+#: g10/tdbio.c:1201
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: 不是一個信任資料庫檔案\n"
 
-#: g10/tdbio.c:1221
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
 
-#: g10/tdbio.c:1226
+#: g10/tdbio.c:1224
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: 無效的檔案版本 %d\n"
 
-#: g10/tdbio.c:1411
+#: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: 讀取自由記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:1419
+#: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: 寫入目錄記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: 記錄歸零時失敗: %s\n"
 
-#: g10/tdbio.c:1459
+#: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: 附加某筆記錄時失敗: %s\n"
 
-#: g10/tdbio.c:1504
+#: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "信任資料庫損毀了; 請執行 \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:149
+#: g10/textfilter.c:147
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "無法處理長於 %d 字符的文字列\n"
 
-#: g10/textfilter.c:248
+#: g10/textfilter.c:246
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "輸入列比 %d 字符還長\n"
 
-#: g10/trustdb.c:227
+#: g10/trustdb.c:225
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' 不是一個有效的長式金鑰 ID\n"
 
-#: g10/trustdb.c:258
+#: g10/trustdb.c:256
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "金鑰 %s: 如受信任的金鑰般被接受了\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:294
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "金鑰 %s 在信任資料庫中出現了不止一次\n"
 
-#: g10/trustdb.c:311
+#: g10/trustdb.c:309
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "金鑰 %s: 受信任的金鑰沒有公鑰 - 已跳過\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "金鑰 %s 已被標記成徹底信任了\n"
 
-#: g10/trustdb.c:345
+#: g10/trustdb.c:343
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "信任記錄 %lu, 請求類別 %d: 讀取失敗: %s\n"
 
-#: g10/trustdb.c:351
+#: g10/trustdb.c:349
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "信任記錄 %lu 不是所請求的類別 %d\n"
 
-#: g10/trustdb.c:447
+#: g10/trustdb.c:445
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:451
 #, c-format
 msgid "using %s trust model\n"
 msgstr "正在使用 %s 信任模型\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:503
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 譯者請參見 trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:505
 msgid "[ revoked]"
 msgstr "[ 已撤銷 ]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:507 g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[ 已過期 ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:511
 msgid "[ unknown]"
 msgstr "[  未知  ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr "[ 未定義 ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr "[  勉強  ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr "[  完全  ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr "[  徹底  ]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "未定義"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "永遠不會"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "勉強"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "完全"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "徹底"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:581 g10/trustdb.c:2350
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任資料庫檢查將於 %s 進行\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要更新信任資料庫\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:837 g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公鑰 %s: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1032
 msgid "please do a --check-trustdb\n"
 msgstr "請做一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1036
 msgid "checking the trustdb\n"
 msgstr "正在檢查信任資料庫\n"
 
-#: g10/trustdb.c:2095
+#: g10/trustdb.c:2093
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
 
-#: g10/trustdb.c:2160
+#: g10/trustdb.c:2158
 msgid "no ultimately trusted keys found\n"
 msgstr "沒有找到任何徹底信任的金鑰\n"
 
-#: g10/trustdb.c:2174
+#: g10/trustdb.c:2172
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "徹底信任金鑰 %s 的公鑰沒有被找到\n"
 
-#: g10/trustdb.c:2197
+#: g10/trustdb.c:2195
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d 個勉強信任以及 %d 個完全信任是 %s 信任模型的最小需求\n"
 
-#: g10/trustdb.c:2283
+#: g10/trustdb.c:2281
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2358
+#: g10/trustdb.c:2356
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
 
-#: g10/verify.c:117
+#: g10/verify.c:116
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -5877,306 +5866,318 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "輸入列 %u 太長或者列末的 LF 遺失了\n"
 
-#: util/errors.c:55
+#: util/errors.c:53
 msgid "general error"
 msgstr "一般性錯誤"
 
-#: util/errors.c:56
+#: util/errors.c:54
 msgid "unknown packet type"
 msgstr "未知的封包型態"
 
-#: util/errors.c:57
+#: util/errors.c:55
 msgid "unknown version"
 msgstr "未知的版本"
 
-#: util/errors.c:58
+#: util/errors.c:56
 msgid "unknown pubkey algorithm"
 msgstr "未知的公鑰演算法"
 
-#: util/errors.c:59
+#: util/errors.c:57
 msgid "unknown digest algorithm"
 msgstr "未知的摘要演算法"
 
-#: util/errors.c:60
+#: util/errors.c:58
 msgid "bad public key"
 msgstr "損壞的公鑰"
 
-#: util/errors.c:61
+#: util/errors.c:59
 msgid "bad secret key"
 msgstr "損壞的私鑰"
 
-#: util/errors.c:62
+#: util/errors.c:60
 msgid "bad signature"
 msgstr "損壞的簽章"
 
-#: util/errors.c:63
+#: util/errors.c:61
 msgid "checksum error"
 msgstr "加總檢查錯誤"
 
-#: util/errors.c:64
+#: util/errors.c:62
 msgid "bad passphrase"
 msgstr "錯誤的密語"
 
-#: util/errors.c:65
+#: util/errors.c:63
 msgid "public key not found"
 msgstr "找不到公鑰"
 
-#: util/errors.c:66
+#: util/errors.c:64
 msgid "unknown cipher algorithm"
 msgstr "未知的編密演算法"
 
-#: util/errors.c:67
+#: util/errors.c:65
 msgid "can't open the keyring"
 msgstr "沒辦法開啟鑰匙圈"
 
-#: util/errors.c:68
+#: util/errors.c:66
 msgid "invalid packet"
 msgstr "無效的封包"
 
-#: util/errors.c:69
+#: util/errors.c:67
 msgid "invalid armor"
 msgstr "無效的封裝"
 
-#: util/errors.c:70
+#: util/errors.c:68
 msgid "no such user id"
 msgstr "沒有這個使用者 ID"
 
-#: util/errors.c:71
+#: util/errors.c:69
 msgid "secret key not available"
 msgstr "無法取用私鑰"
 
-#: util/errors.c:72
+#: util/errors.c:70
 msgid "wrong secret key used"
 msgstr "用了錯誤的私鑰"
 
-#: util/errors.c:73
+#: util/errors.c:71
 msgid "not supported"
 msgstr "未被支援"
 
-#: util/errors.c:74
+#: util/errors.c:72
 msgid "bad key"
 msgstr "損壞的金鑰"
 
-#: util/errors.c:75
+#: util/errors.c:73
 msgid "file read error"
 msgstr "檔案讀取錯誤"
 
-#: util/errors.c:76
+#: util/errors.c:74
 msgid "file write error"
 msgstr "檔案寫入錯誤"
 
-#: util/errors.c:77
+#: util/errors.c:75
 msgid "unknown compress algorithm"
 msgstr "未知的壓縮演算法"
 
-#: util/errors.c:78
+#: util/errors.c:76
 msgid "file open error"
 msgstr "檔案開啟錯誤"
 
-#: util/errors.c:79
+#: util/errors.c:77
 msgid "file create error"
 msgstr "檔案建立錯誤"
 
-#: util/errors.c:80
+#: util/errors.c:78
 msgid "invalid passphrase"
 msgstr "無效的密語"
 
-#: util/errors.c:81
+#: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
 msgstr "未被採用的公鑰演算法"
 
-#: util/errors.c:82
+#: util/errors.c:80
 msgid "unimplemented cipher algorithm"
 msgstr "未被採用的編密演算法"
 
-#: util/errors.c:83
+#: util/errors.c:81
 msgid "unknown signature class"
 msgstr "未知的簽章層級"
 
-#: util/errors.c:84
+#: util/errors.c:82
 msgid "trust database error"
 msgstr "信任資料庫錯誤"
 
-#: util/errors.c:85
+#: util/errors.c:83
 msgid "bad MPI"
 msgstr "損壞的 MPI"
 
-#: util/errors.c:86
+#: util/errors.c:84
 msgid "resource limit"
 msgstr "資源限制"
 
-#: util/errors.c:87
+#: util/errors.c:85
 msgid "invalid keyring"
 msgstr "無效的鑰匙圈"
 
-#: util/errors.c:88
+#: util/errors.c:86
 msgid "bad certificate"
 msgstr "損壞的憑證"
 
-#: util/errors.c:89
+#: util/errors.c:87
 msgid "malformed user id"
 msgstr "被變造過的使用者 ID"
 
-#: util/errors.c:90
+#: util/errors.c:88
 msgid "file close error"
 msgstr "檔案關閉錯誤"
 
-#: util/errors.c:91
+#: util/errors.c:89
 msgid "file rename error"
 msgstr "檔案更名錯誤"
 
-#: util/errors.c:92
+#: util/errors.c:90
 msgid "file delete error"
 msgstr "檔案刪除錯誤"
 
-#: util/errors.c:93
+#: util/errors.c:91
 msgid "unexpected data"
 msgstr "未預期的資料"
 
-#: util/errors.c:94
+#: util/errors.c:92
 msgid "timestamp conflict"
 msgstr "時間戳印有矛盾"
 
-#: util/errors.c:95
+#: util/errors.c:93
 msgid "unusable pubkey algorithm"
 msgstr "無法使用的公鑰演算法"
 
-#: util/errors.c:96
+#: util/errors.c:94
 msgid "file exists"
 msgstr "檔案已存在"
 
-#: util/errors.c:97
+#: util/errors.c:95
 msgid "weak key"
 msgstr "金鑰薄弱"
 
-#: util/errors.c:98
+#: util/errors.c:96
 msgid "invalid argument"
 msgstr "無效的參數"
 
-#: util/errors.c:99
+#: util/errors.c:97
 msgid "bad URI"
 msgstr "損壞的 URI"
 
-#: util/errors.c:100
+#: util/errors.c:98
 msgid "unsupported URI"
 msgstr "未被支援的 URI"
 
-#: util/errors.c:101
+#: util/errors.c:99
 msgid "network error"
 msgstr "網路錯誤"
 
-#: util/errors.c:103
+#: util/errors.c:101
 msgid "not encrypted"
 msgstr "未被加密"
 
-#: util/errors.c:104
+#: util/errors.c:102
 msgid "not processed"
 msgstr "未被處理"
 
-#: util/errors.c:106
+#: util/errors.c:104
 msgid "unusable public key"
 msgstr "不可用的公鑰"
 
-#: util/errors.c:107
+#: util/errors.c:105
 msgid "unusable secret key"
 msgstr "不可用的私鑰"
 
-#: util/errors.c:108
+#: util/errors.c:106
 msgid "keyserver error"
 msgstr "金鑰伺服器錯誤"
 
-#: util/errors.c:109
+#: util/errors.c:107
 msgid "canceled"
 msgstr "已取消"
 
-#: util/errors.c:110
+#: util/errors.c:108
 msgid "no card"
 msgstr "沒有卡片"
 
-#: util/errors.c:111
+#: util/errors.c:109
 #, fuzzy
 msgid "no data"
 msgstr "沒有被簽署過的資料\n"
 
-#: util/logger.c:158
+#: util/logger.c:156
 msgid "ERROR: "
 msgstr "錯誤: "
 
-#: util/logger.c:161
+#: util/logger.c:159
 msgid "WARNING: "
 msgstr "警告: "
 
-#: util/logger.c:224
+#: util/logger.c:222
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... 這是個瑕疵 (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:228
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "妳找到一個瑕疵了 ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:328 util/miscutil.c:365
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:329 util/miscutil.c:370
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:331 util/miscutil.c:367
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:332 util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:371
+#: util/miscutil.c:369
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:374
+#: util/miscutil.c:372
 msgid "qQ"
 msgstr "qQ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:407
+#: util/miscutil.c:405
 msgid "okay|okay"
 msgstr "okay|okay"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:409
+#: util/miscutil.c:407
 msgid "cancel|cancel"
 msgstr "cancel|cancel"
 
-#: util/miscutil.c:410
+#: util/miscutil.c:408
 msgid "oO"
 msgstr "oO"
 
-#: util/miscutil.c:411
+#: util/miscutil.c:409
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:97
+#: util/secmem.c:96
 msgid "WARNING: using insecure memory!\n"
 msgstr "警告: 正在使用不安全的記憶體!\n"
 
-#: util/secmem.c:98
+#: util/secmem.c:97
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
 
-#: util/secmem.c:351
+#: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "尚未啟用安全的記憶體前, 不可能進行操作\n"
 
-#: util/secmem.c:352
+#: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(也許妳選錯程式來做這件事了)\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入標記資料\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入標記資料\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入原則 URL\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入原則 URL\n"
+
 #~ msgid ""
 #~ "a notation name must have only printable characters or spaces, and end "
 #~ "with an '='\n"
diff --git a/scripts/config.rpath b/scripts/config.rpath
index 3f1bef34a..c492a93b6 100755
--- a/scripts/config.rpath
+++ b/scripts/config.rpath
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2005 Free Software Foundation, Inc.
+#   Copyright 1996-2006 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <[email protected]>, 1996
 #
@@ -25,7 +25,7 @@
 #   known workaround is to choose shorter directory names for the build
 #   directory and/or the installation directory.
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 shrext=.so
@@ -35,7 +35,17 @@ host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-cc_basename=`echo "$CC" | sed -e 's%^.*/%%'`
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
 
 # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
 
@@ -48,7 +58,7 @@ else
       wl='-Wl,'
       ;;
     darwin*)
-      case "$cc_basename" in
+      case $cc_basename in
         xlc*)
           wl='-Wl,'
           ;;
@@ -78,6 +88,13 @@ else
         como)
           wl='-lopt='
           ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
+          ;;
       esac
       ;;
     osf3* | osf4* | osf5*)
@@ -120,6 +137,10 @@ case "$host_os" in
       with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
     ;;
@@ -127,6 +148,12 @@ esac
 
 ld_shlibs=yes
 if test "$with_gnu_ld" = yes; then
+  # Set some defaults for GNU ld with shared library support. These
+  # are reset later if shared libraries are not supported. Putting them
+  # here allows them to be overridden if necessary.
+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
+  # option of GNU ld is called -rpath, not --rpath.
+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
   case "$host_os" in
     aix3* | aix4* | aix5*)
       # On AIX/PPC, the GNU linker is very broken
@@ -162,9 +189,20 @@ if test "$with_gnu_ld" = yes; then
         ld_shlibs=no
       fi
       ;;
+    interix3*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
     netbsd*)
       ;;
-    solaris* | sysv5*)
+    solaris*)
       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
         ld_shlibs=no
       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -173,16 +211,23 @@ if test "$with_gnu_ld" = yes; then
         ld_shlibs=no
       fi
       ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+          ld_shlibs=no
+          ;;
+        *)
+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+          else
+            ld_shlibs=no
+          fi
+          ;;
+      esac
+      ;;
     sunos4*)
       hardcode_direct=yes
       ;;
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
@@ -191,10 +236,8 @@ if test "$with_gnu_ld" = yes; then
       fi
       ;;
   esac
-  if test "$ld_shlibs" = yes; then
-    # Unlike libtool, we use -rpath here, not --rpath, since the documented
-    # option of GNU ld is called -rpath, not --rpath.
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
   fi
 else
   case "$host_os" in
@@ -225,6 +268,7 @@ else
               break
             fi
           done
+          ;;
         esac
       fi
       hardcode_direct=yes
@@ -244,6 +288,7 @@ else
             hardcode_libdir_flag_spec='-L$libdir'
             hardcode_libdir_separator=
           fi
+          ;;
         esac
       fi
       # Begin _LT_AC_SYS_LIBPATH_AIX.
@@ -291,7 +336,7 @@ else
       if test "$GCC" = yes ; then
         :
       else
-        case "$cc_basename" in
+        case $cc_basename in
           xlc*)
             ;;
           *)
@@ -326,24 +371,25 @@ else
       # but as the default location of the library.
       hardcode_minus_L=yes
       ;;
-    hpux10* | hpux11*)
+    hpux10*)
       if test "$with_gnu_ld" = no; then
-        case "$host_cpu" in
-          hppa*64*)
-            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-            hardcode_libdir_separator=:
-            hardcode_direct=no
-            ;;
-          ia64*)
-            hardcode_libdir_flag_spec='-L$libdir'
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        hardcode_direct=yes
+        # hardcode_minus_L: Not really in the search PATH,
+        # but as the default location of the library.
+        hardcode_minus_L=yes
+      fi
+      ;;
+    hpux11*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        case $host_cpu in
+          hppa*64*|ia64*)
             hardcode_direct=no
-            # hardcode_minus_L: Not really in the search PATH,
-            # but as the default location of the library.
-            hardcode_minus_L=yes
             ;;
           *)
-            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-            hardcode_libdir_separator=:
             hardcode_direct=yes
             # hardcode_minus_L: Not really in the search PATH,
             # but as the default location of the library.
@@ -397,8 +443,6 @@ else
       fi
       hardcode_libdir_separator=:
       ;;
-    sco3.2v5*)
-      ;;
     solaris*)
       hardcode_libdir_flag_spec='-R$libdir'
       ;;
@@ -427,14 +471,11 @@ else
         ld_shlibs=yes
       fi
       ;;
-    sysv4.2uw2*)
-      hardcode_direct=yes
-      hardcode_minus_L=no
-      ;;
-    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
       ;;
-    sysv5*)
-      hardcode_libdir_flag_spec=
+    sysv5* | sco3.2v5* | sco5v6*)
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
       ;;
     uts4*)
       hardcode_libdir_flag_spec='-L$libdir'
@@ -471,12 +512,12 @@ case "$host_os" in
     ;;
   kfreebsd*-gnu)
     ;;
-  freebsd*)
+  freebsd* | dragonfly*)
     ;;
   gnu*)
     ;;
   hpux9* | hpux10* | hpux11*)
-    case "$host_cpu" in
+    case $host_cpu in
       ia64*)
         shrext=.so
         ;;
@@ -488,6 +529,8 @@ case "$host_os" in
         ;;
     esac
     ;;
+  interix3*)
+    ;;
   irix5* | irix6* | nonstopux*)
     case "$host_os" in
       irix5* | nonstopux*)
@@ -523,16 +566,16 @@ case "$host_os" in
     ;;
   osf3* | osf4* | osf5*)
     ;;
-  sco3.2v5*)
-    ;;
   solaris*)
     ;;
   sunos4*)
     ;;
-  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  sysv4 | sysv4.3*)
     ;;
   sysv4*MP*)
     ;;
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    ;;
   uts4*)
     ;;
 esac
diff --git a/scripts/texinfo.tex b/scripts/texinfo.tex
index e9293f3b9..5063065f2 100644
--- a/scripts/texinfo.tex
+++ b/scripts/texinfo.tex
@@ -3,14 +3,15 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2003-05-04.08}
+\def\texinfoversion{2007-05-03.09}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
-% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+% 2007 Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software; you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
-% published by the Free Software Foundation; either version 2, or (at
+% published by the Free Software Foundation; either version 3, or (at
 % your option) any later version.
 %
 % This texinfo.tex file is distributed in the hope that it will be
@@ -19,25 +20,19 @@
 % General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this texinfo.tex file; see the file COPYING.  If not, write
-% to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% along with this texinfo.tex file; see the file COPYING.  If not, 
+% see <http://www.gnu.org/licenses/>.
 %
-% In other words, you are welcome to use, share and improve this program.
-% You are forbidden to forbid anyone else to use, share and improve
-% what you give them.   Help stamp out software-hoarding!
+% As a special exception, when this file is read by TeX when processing
+% a Texinfo source document, you may use the result without
+% restriction.  (This has been our intent since Texinfo was invented.)
 %
 % Please try the latest version of texinfo.tex before submitting bug
 % reports; you can get the latest version from:
-%   ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex
-%     (and all GNU mirrors, see http://www.gnu.org/order/ftp.html)
+%   http://www.gnu.org/software/texinfo/ (the Texinfo home page), or
 %   ftp://tug.org/tex/texinfo.tex
-%     (and all CTAN mirrors, see http://www.ctan.org),
-%   and /home/gd/gnu/doc/texinfo.tex on the GNU machines.
-%
-% The GNU Texinfo home page is http://www.gnu.org/software/texinfo.
-%
-% The texinfo.tex in any given Texinfo distribution could well be out
+%     (and all CTAN mirrors, see http://www.ctan.org).
+% The texinfo.tex in any given distribution could well be out
 % of date, so if that's what you're using, please check.
 %
 % Send bug reports to [email protected].  Please include including a
@@ -59,6 +54,9 @@
 % It is possible to adapt texinfo.tex for other languages, to some
 % extent.  You can get the existing language-specific files from the
 % full Texinfo distribution.
+%
+% The GNU Texinfo home page is http://www.gnu.org/software/texinfo.
+
 
 \message{Loading texinfo [version \texinfoversion]:}
 
@@ -68,7 +66,7 @@
 \everyjob{\message{[Texinfo version \texinfoversion]}%
   \catcode`+=\active \catcode`\_=\active}
 
-\message{Basics,}
+
 \chardef\other=12
 
 % We never want plain's \outer definition of \+ in Texinfo.
@@ -85,12 +83,16 @@
 \let\ptexend=\end
 \let\ptexequiv=\equiv
 \let\ptexexclam=\!
+\let\ptexfootnote=\footnote
 \let\ptexgtr=>
 \let\ptexhat=^
 \let\ptexi=\i
 \let\ptexindent=\indent
+\let\ptexinsert=\insert
 \let\ptexlbrace=\{
 \let\ptexless=<
+\let\ptexnewwrite\newwrite
+\let\ptexnoindent=\noindent
 \let\ptexplus=+
 \let\ptexrbrace=\}
 \let\ptexslash=\/
@@ -101,6 +103,15 @@
 % starts a new line in the output.
 \newlinechar = `^^J
 
+% Use TeX 3.0's \inputlineno to get the line number, for better error
+% messages, but if we're using an old version of TeX, don't do anything.
+%
+\ifx\inputlineno\thisisundefined
+  \let\linenumber = \empty % Pre-3.0.
+\else
+  \def\linenumber{l.\the\inputlineno:\space}
+\fi
+
 % Set up fixed words for English if not already set.
 \ifx\putwordAppendix\undefined  \gdef\putwordAppendix{Appendix}\fi
 \ifx\putwordChapter\undefined   \gdef\putwordChapter{Chapter}\fi
@@ -139,43 +150,83 @@
 \ifx\putwordDefspec\undefined   \gdef\putwordDefspec{Special Form}\fi
 \ifx\putwordDefvar\undefined    \gdef\putwordDefvar{Variable}\fi
 \ifx\putwordDefopt\undefined    \gdef\putwordDefopt{User Option}\fi
-\ifx\putwordDeftypevar\undefined\gdef\putwordDeftypevar{Variable}\fi
 \ifx\putwordDeffunc\undefined   \gdef\putwordDeffunc{Function}\fi
-\ifx\putwordDeftypefun\undefined\gdef\putwordDeftypefun{Function}\fi
 
-% In some macros, we cannot use the `\? notation---the left quote is
-% in some cases the escape char.
+% Since the category of space is not known, we have to be careful.
+\chardef\spacecat = 10
+\def\spaceisspace{\catcode`\ =\spacecat}
+
+% sometimes characters are active, so we need control sequences.
 \chardef\colonChar = `\:
 \chardef\commaChar = `\,
+\chardef\dashChar  = `\-
 \chardef\dotChar   = `\.
-\chardef\equalChar = `\=
 \chardef\exclamChar= `\!
+\chardef\lquoteChar= `\`
 \chardef\questChar = `\?
+\chardef\rquoteChar= `\'
 \chardef\semiChar  = `\;
-\chardef\spaceChar = `\ %
 \chardef\underChar = `\_
 
 % Ignore a token.
 %
 \def\gobble#1{}
 
-% True if #1 is the empty string, i.e., called like `\ifempty{}'.
-%
-\def\ifempty#1{\ifemptyx #1\emptymarkA\emptymarkB}%
-\def\ifemptyx#1#2\emptymarkB{\ifx #1\emptymarkA}%
+% The following is used inside several \edef's.
+\def\makecsname#1{\expandafter\noexpand\csname#1\endcsname}
 
 % Hyphenation fixes.
-\hyphenation{ap-pen-dix}
-\hyphenation{eshell}
-\hyphenation{mini-buf-fer mini-buf-fers}
-\hyphenation{time-stamp}
-\hyphenation{white-space}
+\hyphenation{
+  Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script
+  ap-pen-dix bit-map bit-maps
+  data-base data-bases eshell fall-ing half-way long-est man-u-script
+  man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm
+  par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces
+  spell-ing spell-ings
+  stand-alone strong-est time-stamp time-stamps which-ever white-space
+  wide-spread wrap-around
+}
 
 % Margin to add to right of even pages, to left of odd pages.
 \newdimen\bindingoffset
 \newdimen\normaloffset
 \newdimen\pagewidth \newdimen\pageheight
 
+% For a final copy, take out the rectangles
+% that mark overfull boxes (in case you have decided
+% that the text looks ok even though it passes the margin).
+%
+\def\finalout{\overfullrule=0pt}
+
+% @| inserts a changebar to the left of the current line.  It should
+% surround any changed text.  This approach does *not* work if the
+% change spans more than two lines of output.  To handle that, we would
+% have adopt a much more difficult approach (putting marks into the main
+% vertical list for the beginning and end of each change).
+%
+\def\|{%
+  % \vadjust can only be used in horizontal mode.
+  \leavevmode
+  %
+  % Append this vertical mode material after the current line in the output.
+  \vadjust{%
+    % We want to insert a rule with the height and depth of the current
+    % leading; that is exactly what \strutbox is supposed to record.
+    \vskip-\baselineskip
+    %
+    % \vadjust-items are inserted at the left edge of the type.  So
+    % the \llap here moves out into the left-hand margin.
+    \llap{%
+      %
+      % For a thicker or thinner bar, change the `1pt'.
+      \vrule height\baselineskip width1pt
+      %
+      % This is the space between the bar and the text.
+      \hskip 12pt
+    }%
+  }%
+}
+
 % Sometimes it is convenient to have everything in the transcript file
 % and nothing on the terminal.  We don't just call \tracingall here,
 % since that produces some useless output on the terminal.  We also make
@@ -200,7 +251,7 @@
     \tracingassigns1
   \fi
   \tracingcommands3  % 3 gives us more in etex
-  \errorcontextlines\maxdimen
+  \errorcontextlines16
 }%
 
 % add check for \lastpenalty to plain's definitions.  If the last thing
@@ -252,13 +303,17 @@
     % take effect in \write's, yet the group defined by the \vbox ends
     % before the \shipout runs.
     %
-    \escapechar = `\\     % use backslash in output files.
     \indexdummies         % don't expand commands in the output.
     \normalturnoffactive  % \ in index entries must not stay \, e.g., if
-                   % the page break happens to be in the middle of an example.
+               % the page break happens to be in the middle of an example.
+               % We don't want .vr (or whatever) entries like this:
+               % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
+               % "\acronym" won't work when it's read back in;
+               % it needs to be 
+               % {\code {{\tt \backslashcurfont }acronym}
     \shipout\vbox{%
       % Do this early so pdf references go to the beginning of the page.
-      \ifpdfmakepagedest \pdfmkdest{\the\pageno} \fi
+      \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
       %
       \ifcropmarks \vbox to \outervsize\bgroup
         \hsize = \outerhsize
@@ -283,9 +338,9 @@
       \pagebody{#1}%
       \ifdim\ht\footlinebox > 0pt
         % Only leave this space if the footline is nonempty.
-        % (We lessened \vsize for it in \oddfootingxxx.)
+        % (We lessened \vsize for it in \oddfootingyyy.)
         % The \baselineskip=24pt in plain's \makefootline has no effect.
-        \vskip 2\baselineskip
+        \vskip 24pt
         \unvbox\footlinebox
       \fi
       %
@@ -306,7 +361,7 @@
       \egroup % \vbox from first cropmarks clause
       \fi
     }% end of \shipout\vbox
-  }% end of group with \normalturnoffactive
+  }% end of group with \indexdummies
   \advancepageno
   \ifnum\outputpenalty>-20000 \else\dosupereject\fi
 }
@@ -339,132 +394,161 @@
 % the input line (except we remove a trailing comment).  #1 should be a
 % macro which expects an ordinary undelimited TeX argument.
 %
-\def\parsearg#1{%
-  \let\next = #1%
+\def\parsearg{\parseargusing{}}
+\def\parseargusing#1#2{%
+  \def\argtorun{#2}%
   \begingroup
     \obeylines
-    \futurelet\temp\parseargx
-}
-
-% If the next token is an obeyed space (from an @example environment or
-% the like), remove it and recurse.  Otherwise, we're done.
-\def\parseargx{%
-  % \obeyedspace is defined far below, after the definition of \sepspaces.
-  \ifx\obeyedspace\temp
-    \expandafter\parseargdiscardspace
-  \else
-    \expandafter\parseargline
-  \fi
+    \spaceisspace
+    #1%
+    \parseargline\empty% Insert the \empty token, see \finishparsearg below.
 }
 
-% Remove a single space (as the delimiter token to the macro call).
-{\obeyspaces %
- \gdef\parseargdiscardspace {\futurelet\temp\parseargx}}
-
 {\obeylines %
   \gdef\parseargline#1^^M{%
     \endgroup % End of the group started in \parsearg.
-    %
-    % First remove any @c comment, then any @comment.
-    % Result of each macro is put in \toks0.
-    \argremovec #1\c\relax %
-    \expandafter\argremovecomment \the\toks0 \comment\relax %
-    %
-    % Call the caller's macro, saved as \next in \parsearg.
-    \expandafter\next\expandafter{\the\toks0}%
+    \argremovecomment #1\comment\ArgTerm%
   }%
 }
 
-% Since all \c{,omment} does is throw away the argument, we can let TeX
-% do that for us.  The \relax here is matched by the \relax in the call
-% in \parseargline; it could be more or less anything, its purpose is
-% just to delimit the argument to the \c.
-\def\argremovec#1\c#2\relax{\toks0 = {#1}}
-\def\argremovecomment#1\comment#2\relax{\toks0 = {#1}}
+% First remove any @comment, then any @c comment.
+\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
+\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
 
-% \argremovec{,omment} might leave us with trailing spaces, though; e.g.,
+% Each occurence of `\^^M' or `<space>\^^M' is replaced by a single space.
+%
+% \argremovec might leave us with trailing space, e.g.,
 %    @end itemize  @c foo
-% will have two active spaces as part of the argument with the
-% `itemize'.  Here we remove all active spaces from #1, and assign the
-% result to \toks0.
-%
-% This loses if there are any *other* active characters besides spaces
-% in the argument -- _ ^ +, for example -- since they get expanded.
-% Fortunately, Texinfo does not define any such commands.  (If it ever
-% does, the catcode of the characters in questionwill have to be changed
-% here.)  But this means we cannot call \removeactivespaces as part of
-% \argremovec{,omment}, since @c uses \parsearg, and thus the argument
-% that \parsearg gets might well have any character at all in it.
-%
-\def\removeactivespaces#1{%
-  \begingroup
-    \ignoreactivespaces
-    \edef\temp{#1}%
-    \global\toks0 = \expandafter{\temp}%
-  \endgroup
+% This space token undergoes the same procedure and is eventually removed
+% by \finishparsearg.
+%
+\def\argcheckspaces#1\^^M{\argcheckspacesX#1\^^M \^^M}
+\def\argcheckspacesX#1 \^^M{\argcheckspacesY#1\^^M}
+\def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
+  \def\temp{#3}%
+  \ifx\temp\empty
+    % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp:
+    \let\temp\finishparsearg
+  \else
+    \let\temp\argcheckspaces
+  \fi
+  % Put the space token in:
+  \temp#1 #3\ArgTerm
 }
 
-% Change the active space to expand to nothing.
+% If a _delimited_ argument is enclosed in braces, they get stripped; so
+% to get _exactly_ the rest of the line, we had to prevent such situation.
+% We prepended an \empty token at the very beginning and we expand it now,
+% just before passing the control to \argtorun.
+% (Similarily, we have to think about #3 of \argcheckspacesY above: it is
+% either the null string, or it ends with \^^M---thus there is no danger
+% that a pair of braces would be stripped.
 %
-\begingroup
+% But first, we have to remove the trailing space token.
+%
+\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
+
+% \parseargdef\foo{...}
+%	is roughly equivalent to
+% \def\foo{\parsearg\Xfoo}
+% \def\Xfoo#1{...}
+%
+% Actually, I use \csname\string\foo\endcsname, ie. \\foo, as it is my
+% favourite TeX trick.  --kasal, 16nov03
+
+\def\parseargdef#1{%
+  \expandafter \doparseargdef \csname\string#1\endcsname #1%
+}
+\def\doparseargdef#1#2{%
+  \def#2{\parsearg#1}%
+  \def#1##1%
+}
+
+% Several utility definitions with active space:
+{
   \obeyspaces
-  \gdef\ignoreactivespaces{\obeyspaces\let =\empty}
-\endgroup
+  \gdef\obeyedspace{ }
+
+  % Make each space character in the input produce a normal interword
+  % space in the output.  Don't allow a line break at this space, as this
+  % is used only in environments like @example, where each line of input
+  % should produce a line of output anyway.
+  %
+  \gdef\sepspaces{\obeyspaces\let =\tie}
+
+  % If an index command is used in an @example environment, any spaces
+  % therein should become regular spaces in the raw index file, not the
+  % expansion of \tie (\leavevmode \penalty \@M \ ).
+  \gdef\unsepspaces{\let =\space}
+}
 
 
 \def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next}
 
-%% These are used to keep @begin/@end levels from running away
-%% Call \inENV within environments (after a \begingroup)
-\newif\ifENV \ENVfalse \def\inENV{\ifENV\relax\else\ENVtrue\fi}
-\def\ENVcheck{%
-\ifENV\errmessage{Still within an environment; press RETURN to continue}
-\endgroup\fi} % This is not perfect, but it should reduce lossage
+% Define the framework for environments in texinfo.tex.  It's used like this:
+%
+%   \envdef\foo{...}
+%   \def\Efoo{...}
+%
+% It's the responsibility of \envdef to insert \begingroup before the
+% actual body; @end closes the group after calling \Efoo.  \envdef also
+% defines \thisenv, so the current environment is known; @end checks
+% whether the environment name matches.  The \checkenv macro can also be
+% used to check whether the current environment is the one expected.
+%
+% Non-false conditionals (@iftex, @ifset) don't fit into this, so they
+% are not treated as enviroments; they don't open a group.  (The
+% implementation of @end takes care not to call \endgroup in this
+% special case.)
 
-% @begin foo  is the same as @foo, for now.
-\newhelp\EMsimple{Press RETURN to continue.}
 
-\outer\def\begin{\parsearg\beginxxx}
+% At runtime, environments start with this:
+\def\startenvironment#1{\begingroup\def\thisenv{#1}}
+% initialize
+\let\thisenv\empty
 
-\def\beginxxx #1{%
-\expandafter\ifx\csname #1\endcsname\relax
-{\errhelp=\EMsimple \errmessage{Undefined command @begin #1}}\else
-\csname #1\endcsname\fi}
+% ... but they get defined via ``\envdef\foo{...}'':
+\long\def\envdef#1#2{\def#1{\startenvironment#1#2}}
+\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}}
 
-% @end foo executes the definition of \Efoo.
-%
-\def\end{\parsearg\endxxx}
-\def\endxxx #1{%
-  \removeactivespaces{#1}%
-  \edef\endthing{\the\toks0}%
-  %
-  \expandafter\ifx\csname E\endthing\endcsname\relax
-    \expandafter\ifx\csname \endthing\endcsname\relax
-      % There's no \foo, i.e., no ``environment'' foo.
-      \errhelp = \EMsimple
-      \errmessage{Undefined command `@end \endthing'}%
-    \else
-      \unmatchedenderror\endthing
-    \fi
+% Check whether we're in the right environment:
+\def\checkenv#1{%
+  \def\temp{#1}%
+  \ifx\thisenv\temp
   \else
-    % Everything's ok; the right environment has been started.
-    \csname E\endthing\endcsname
+    \badenverr
   \fi
 }
 
-% There is an environment #1, but it hasn't been started.  Give an error.
-%
-\def\unmatchedenderror#1{%
+% Evironment mismatch, #1 expected:
+\def\badenverr{%
   \errhelp = \EMsimple
-  \errmessage{This `@end #1' doesn't have a matching `@#1'}%
+  \errmessage{This command can appear only \inenvironment\temp,
+    not \inenvironment\thisenv}%
+}
+\def\inenvironment#1{%
+  \ifx#1\empty
+    out of any environment%
+  \else
+    in environment \expandafter\string#1%
+  \fi
 }
 
-% Define the control sequence \E#1 to give an unmatched @end error.
+% @end foo executes the definition of \Efoo.
+% But first, it executes a specialized version of \checkenv
 %
-\def\defineunmatchedend#1{%
-  \expandafter\def\csname E#1\endcsname{\unmatchedenderror{#1}}%
+\parseargdef\end{%
+  \if 1\csname iscond.#1\endcsname
+  \else
+    % The general wording of \badenverr may not be ideal, but... --kasal, 06nov03
+    \expandafter\checkenv\csname#1\endcsname
+    \csname E#1\endcsname
+    \endgroup
+  \fi
 }
 
+\newhelp\EMsimple{Press RETURN to continue.}
+
 
 %% Simple single-character @ commands
 
@@ -486,7 +570,7 @@
 \let\}=\myrbrace
 \begingroup
   % Definitions to produce \{ and \} commands for indices,
-  % and @{ and @} for the aux file.
+  % and @{ and @} for the aux/toc files.
   \catcode`\{ = \other \catcode`\} = \other
   \catcode`\[ = 1 \catcode`\] = 2
   \catcode`\! = 0 \catcode`\\ = \other
@@ -496,6 +580,9 @@
   !gdef!rbraceatcmd[@}]%
 !endgroup
 
+% @comma{} to avoid , parsing problems.
+\let\comma = ,
+
 % Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
 % Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
 \let\, = \c
@@ -505,10 +592,12 @@
 \let\ubaraccent = \b
 \let\udotaccent = \d
 
-% Other special characters: @questiondown @exclamdown
+% Other special characters: @questiondown @exclamdown @ordf @ordm
 % Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
 \def\questiondown{?`}
 \def\exclamdown{!`}
+\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
+\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
 
 % Dotless i and dotless j, used for accents.
 \def\imacro{i}
@@ -521,6 +610,25 @@
   \fi\fi
 }
 
+% The \TeX{} logo, as in plain, but resetting the spacing so that a
+% period following counts as ending a sentence.  (Idea found in latex.)
+%
+\edef\TeX{\TeX \spacefactor=1000 }
+
+% @LaTeX{} logo.  Not quite the same results as the definition in
+% latex.ltx, since we use a different font for the raised A; it's most
+% convenient for us to use an explicitly smaller font, rather than using
+% the \scriptstyle font (since we don't reset \scriptstyle and
+% \scriptscriptstyle).
+%
+\def\LaTeX{%
+  L\kern-.36em
+  {\setbox0=\hbox{T}%
+   \vbox to \ht0{\hbox{\selectfonts\lllsize A}\vss}}%
+  \kern-.15em
+  \TeX
+}
+
 % Be sure we're in horizontal mode when doing a tie, since we make space
 % equivalent to this in @example-like environments. Otherwise, a space
 % at the beginning of a line will start with \penalty -- and
@@ -543,13 +651,28 @@
 \let\/=\allowbreak
 
 % @. is an end-of-sentence period.
-\def\.{.\spacefactor=3000 }
+\def\.{.\spacefactor=\endofsentencespacefactor\space}
 
 % @! is an end-of-sentence bang.
-\def\!{!\spacefactor=3000 }
+\def\!{!\spacefactor=\endofsentencespacefactor\space}
 
 % @? is an end-of-sentence query.
-\def\?{?\spacefactor=3000 }
+\def\?{?\spacefactor=\endofsentencespacefactor\space}
+
+% @frenchspacing on|off  says whether to put extra space after punctuation.
+% 
+\def\onword{on}
+\def\offword{off}
+%
+\parseargdef\frenchspacing{%
+  \def\temp{#1}%
+  \ifx\temp\onword \plainfrenchspacing
+  \else\ifx\temp\offword \plainnonfrenchspacing
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @frenchspacing option `\temp', must be on/off}%
+  \fi\fi
+}
 
 % @w prevents a word break.  Without the \leavevmode, @w at the
 % beginning of a paragraph, when TeX is still in vertical mode, would
@@ -574,59 +697,14 @@
 \newbox\groupbox
 \def\vfilllimit{0.7}
 %
-\def\group{\begingroup
-  \ifnum\catcode13=\active \else
+\envdef\group{%
+  \ifnum\catcode`\^^M=\active \else
     \errhelp = \groupinvalidhelp
     \errmessage{@group invalid in context where filling is enabled}%
   \fi
-  %
-  % The \vtop we start below produces a box with normal height and large
-  % depth; thus, TeX puts \baselineskip glue before it, and (when the
-  % next line of text is done) \lineskip glue after it.  (See p.82 of
-  % the TeXbook.)  Thus, space below is not quite equal to space
-  % above.  But it's pretty close.
-  \def\Egroup{%
-    \egroup           % End the \vtop.
-    % \dimen0 is the vertical size of the group's box.
-    \dimen0 = \ht\groupbox  \advance\dimen0 by \dp\groupbox
-    % \dimen2 is how much space is left on the page (more or less).
-    \dimen2 = \pageheight   \advance\dimen2 by -\pagetotal
-    % if the group doesn't fit on the current page, and it's a big big
-    % group, force a page break.
-    \ifdim \dimen0 > \dimen2
-      \ifdim \pagetotal < \vfilllimit\pageheight
-        \page
-      \fi
-    \fi
-    \copy\groupbox
-    \endgroup         % End the \group.
-  }%
+  \startsavinginserts
   %
   \setbox\groupbox = \vtop\bgroup
-    % We have to put a strut on the last line in case the @group is in
-    % the midst of an example, rather than completely enclosing it.
-    % Otherwise, the interline space between the last line of the group
-    % and the first line afterwards is too small.  But we can't put the
-    % strut in \Egroup, since there it would be on a line by itself.
-    % Hence this just inserts a strut at the beginning of each line.
-    \everypar = {\strut}%
-    %
-    % Since we have a strut on every line, we don't need any of TeX's
-    % normal interline spacing.
-    \offinterlineskip
-    %
-    % OK, but now we have to do something about blank
-    % lines in the input in @example-like environments, which normally
-    % just turn into \lisppar, which will insert no space now that we've
-    % turned off the interline space.  Simplest is to make them be an
-    % empty paragraph.
-    \ifx\par\lisppar
-      \edef\par{\leavevmode \par}%
-      %
-      % Reset ^^M's definition to new definition of \par.
-      \obeylines
-    \fi
-    %
     % Do @comment since we are called inside an environment such as
     % @example, where each end-of-line in the input causes an
     % end-of-line in the output.  We don't want the end-of-line after
@@ -636,6 +714,32 @@
     \comment
 }
 %
+% The \vtop produces a box with normal height and large depth; thus, TeX puts
+% \baselineskip glue before it, and (when the next line of text is done)
+% \lineskip glue after it.  Thus, space below is not quite equal to space
+% above.  But it's pretty close.
+\def\Egroup{%
+    % To get correct interline space between the last line of the group
+    % and the first line afterwards, we have to propagate \prevdepth.
+    \endgraf % Not \par, as it may have been set to \lisppar.
+    \global\dimen1 = \prevdepth
+  \egroup           % End the \vtop.
+  % \dimen0 is the vertical size of the group's box.
+  \dimen0 = \ht\groupbox  \advance\dimen0 by \dp\groupbox
+  % \dimen2 is how much space is left on the page (more or less).
+  \dimen2 = \pageheight   \advance\dimen2 by -\pagetotal
+  % if the group doesn't fit on the current page, and it's a big big
+  % group, force a page break.
+  \ifdim \dimen0 > \dimen2
+    \ifdim \pagetotal < \vfilllimit\pageheight
+      \page
+    \fi
+  \fi
+  \box\groupbox
+  \prevdepth = \dimen1
+  \checkinserts
+}
+%
 % TeX puts in an \escapechar (i.e., `@') at the beginning of the help
 % message, so this ends up printing `@group can only ...'.
 %
@@ -648,10 +752,8 @@ where each line of input produces a line of output.}
 
 \newdimen\mil  \mil=0.001in
 
-\def\need{\parsearg\needx}
-
 % Old definition--didn't work.
-%\def\needx #1{\par %
+%\parseargdef\need{\par %
 %% This method tries to make TeX break the page naturally
 %% if the depth of the box does not fit.
 %{\baselineskip=0pt%
@@ -659,7 +761,7 @@ where each line of input produces a line of output.}
 %\prevdepth=-1000pt
 %}}
 
-\def\needx#1{%
+\parseargdef\need{%
   % Ensure vertical mode, so we don't make a big box in the middle of a
   % paragraph.
   \par
@@ -698,35 +800,10 @@ where each line of input produces a line of output.}
   \fi
 }
 
-% @br   forces paragraph break
+% @br   forces paragraph break (and is undocumented).
 
 \let\br = \par
 
-% @dots{} output an ellipsis using the current font.
-% We do .5em per period so that it has the same spacing in a typewriter
-% font as three actual period characters.
-%
-\def\dots{%
-  \leavevmode
-  \hbox to 1.5em{%
-    \hskip 0pt plus 0.25fil minus 0.25fil
-    .\hss.\hss.%
-    \hskip 0pt plus 0.5fil minus 0.5fil
-  }%
-}
-
-% @enddots{} is an end-of-sentence ellipsis.
-%
-\def\enddots{%
-  \leavevmode
-  \hbox to 2em{%
-    \hskip 0pt plus 0.25fil minus 0.25fil
-    .\hss.\hss.\hss.%
-    \hskip 0pt plus 0.5fil minus 0.5fil
-  }%
-  \spacefactor=3000
-}
-
 % @page forces the start of a new page.
 %
 \def\page{\par\vfill\supereject}
@@ -739,13 +816,11 @@ where each line of input produces a line of output.}
 \newskip\exdentamount
 
 % This defn is used inside fill environments such as @defun.
-\def\exdent{\parsearg\exdentyyy}
-\def\exdentyyy #1{{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break}}
+\parseargdef\exdent{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break}
 
 % This defn is used inside nofill environments such as @example.
-\def\nofillexdent{\parsearg\nofillexdentyyy}
-\def\nofillexdentyyy #1{{\advance \leftskip by -\exdentamount
-\leftline{\hskip\leftskip{\rm#1}}}}
+\parseargdef\nofillexdent{{\advance \leftskip by -\exdentamount
+  \leftline{\hskip\leftskip{\rm#1}}}}
 
 % @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current
 % paragraph.  For more general purposes, use the \margin insertion
@@ -797,8 +872,19 @@ where each line of input produces a line of output.}
 }
 
 % @include file    insert text of that file as input.
-% Allow normal characters that  we make active in the argument (a file name).
-\def\include{\begingroup
+%
+\def\include{\parseargusing\filenamecatcodes\includezzz}
+\def\includezzz#1{%
+  \pushthisfilestack
+  \def\thisfile{#1}%
+  {%
+    \makevalueexpandable
+    \def\temp{\input #1 }%
+    \expandafter
+  }\temp
+  \popthisfilestack
+}
+\def\filenamecatcodes{%
   \catcode`\\=\other
   \catcode`~=\other
   \catcode`^=\other
@@ -807,33 +893,50 @@ where each line of input produces a line of output.}
   \catcode`<=\other
   \catcode`>=\other
   \catcode`+=\other
-  \parsearg\includezzz}
-% Restore active chars for included file.
-\def\includezzz#1{\endgroup\begingroup
-  % Read the included file in a group so nested @include's work.
-  \def\thisfile{#1}%
-  \let\value=\expandablevalue
-  \input\thisfile
-\endgroup}
+  \catcode`-=\other
+}
+
+\def\pushthisfilestack{%
+  \expandafter\pushthisfilestackX\popthisfilestack\StackTerm
+}
+\def\pushthisfilestackX{%
+  \expandafter\pushthisfilestackY\thisfile\StackTerm
+}
+\def\pushthisfilestackY #1\StackTerm #2\StackTerm {%
+  \gdef\popthisfilestack{\gdef\thisfile{#1}\gdef\popthisfilestack{#2}}%
+}
+
+\def\popthisfilestack{\errthisfilestackempty}
+\def\errthisfilestackempty{\errmessage{Internal error:
+  the stack of filenames is empty.}}
 
 \def\thisfile{}
 
 % @center line
 % outputs that line, centered.
 %
-\def\center{\parsearg\docenter}
-\def\docenter#1{{%
-  \ifhmode \hfil\break \fi
-  \advance\hsize by -\leftskip
-  \advance\hsize by -\rightskip
-  \line{\hfil \ignorespaces#1\unskip \hfil}%
-  \ifhmode \break \fi
-}}
+\parseargdef\center{%
+  \ifhmode
+    \let\next\centerH
+  \else
+    \let\next\centerV
+  \fi
+  \next{\hfil \ignorespaces#1\unskip \hfil}%
+}
+\def\centerH#1{%
+  {%
+    \hfil\break
+    \advance\hsize by -\leftskip
+    \advance\hsize by -\rightskip
+    \line{#1}%
+    \break
+  }%
+}
+\def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}}
 
 % @sp n   outputs n lines of vertical space
 
-\def\sp{\parsearg\spxxx}
-\def\spxxx #1{\vskip #1\baselineskip}
+\parseargdef\sp{\vskip #1\baselineskip}
 
 % @comment ...line which is ignored...
 % @c is the same as @comment
@@ -854,8 +957,7 @@ where each line of input produces a line of output.}
 \def\asisword{asis} % no translation, these are keywords
 \def\noneword{none}
 %
-\def\paragraphindent{\parsearg\doparagraphindent}
-\def\doparagraphindent#1{%
+\parseargdef\paragraphindent{%
   \def\temp{#1}%
   \ifx\temp\asisword
   \else
@@ -872,8 +974,7 @@ where each line of input produces a line of output.}
 % We'll use ems for NCHARS like @paragraphindent.
 % It seems @exampleindent asis isn't necessary, but
 % I preserve it to make it similar to @paragraphindent.
-\def\exampleindent{\parsearg\doexampleindent}
-\def\doexampleindent#1{%
+\parseargdef\exampleindent{%
   \def\temp{#1}%
   \ifx\temp\asisword
   \else
@@ -887,21 +988,18 @@ where each line of input produces a line of output.}
 
 % @firstparagraphindent WORD
 % If WORD is `none', then suppress indentation of the first paragraph
-% after a section heading.  If WORD is `insert', then do indentat such
+% after a section heading.  If WORD is `insert', then do indent at such
 % paragraphs.
 %
 % The paragraph indentation is suppressed or not by calling
-% \suppressfirstparagraphindent, which the sectioning commands do.  We
-% switch the definition of this back and forth according to WORD.  By
-% default, we suppress indentation.
+% \suppressfirstparagraphindent, which the sectioning commands do.
+% We switch the definition of this back and forth according to WORD.
+% By default, we suppress indentation.
 %
 \def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent}
-\newdimen\currentparindent
-%
 \def\insertword{insert}
 %
-\def\firstparagraphindent{\parsearg\dofirstparagraphindent}
-\def\dofirstparagraphindent#1{%
+\parseargdef\firstparagraphindent{%
   \def\temp{#1}%
   \ifx\temp\noneword
     \let\suppressfirstparagraphindent = \dosuppressfirstparagraphindent
@@ -921,15 +1019,24 @@ where each line of input produces a line of output.}
 %
 \gdef\dosuppressfirstparagraphindent{%
   \gdef\indent{%
-    \global\let\indent=\ptexindent
-    \global\everypar = {}%
+    \restorefirstparagraphindent
+    \indent
+  }%
+  \gdef\noindent{%
+    \restorefirstparagraphindent
+    \noindent
   }%
   \global\everypar = {%
-    \kern-\parindent
-    \global\let\indent=\ptexindent
-    \global\everypar = {}%
+    \kern -\parindent
+    \restorefirstparagraphindent
   }%
-}%
+}
+
+\gdef\restorefirstparagraphindent{%
+  \global \let \indent = \ptexindent
+  \global \let \noindent = \ptexnoindent
+  \global \everypar = {}%
+}
 
 
 % @asis just yields its argument.  Used with @table, for example.
@@ -937,23 +1044,18 @@ where each line of input produces a line of output.}
 \def\asis#1{#1}
 
 % @math outputs its argument in math mode.
-% We don't use $'s directly in the definition of \math because we need
-% to set catcodes according to plain TeX first, to allow for subscripts,
-% superscripts, special math chars, etc.
-%
-\let\implicitmath = $%$ font-lock fix
 %
 % One complication: _ usually means subscripts, but it could also mean
 % an actual _ character, as in @math{@var{some_variable} + 1}.  So make
-% _ within @math be active (mathcode "8000), and distinguish by seeing
-% if the current family is \slfam, which is what @var uses.
-%
-{\catcode\underChar = \active
-\gdef\mathunderscore{%
-  \catcode\underChar=\active
-  \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
-}}
-%
+% _ active, and distinguish by seeing if the current family is \slfam,
+% which is what @var uses.
+{
+  \catcode`\_ = \active
+  \gdef\mathunderscore{%
+    \catcode`\_=\active
+    \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
+  }
+}
 % Another complication: we want \\ (and @\) to output a \ character.
 % FYI, plain.tex uses \\ as a temporary control sequence (why?), but
 % this is not advertised and we don't care.  Texinfo does not
@@ -964,15 +1066,16 @@ where each line of input produces a line of output.}
 %
 \def\math{%
   \tex
-  \mathcode`\_="8000 \mathunderscore
+  \mathunderscore
   \let\\ = \mathbackslash
   \mathactive
-  \implicitmath\finishmath}
-\def\finishmath#1{#1\implicitmath\Etex}
+  $\finishmath
+}
+\def\finishmath#1{#1$\endgroup}  % Close the group opened by \tex.
 
 % Some active characters (such as <) are spaced differently in math.
-% We have to reset their definitions in case the @math was an
-% argument to a command which set the catcodes (such as @item or @section).
+% We have to reset their definitions in case the @math was an argument
+% to a command which sets the catcodes (such as @item or @section).
 %
 {
   \catcode`^ = \active
@@ -988,8 +1091,42 @@ where each line of input produces a line of output.}
 }
 
 % @bullet and @minus need the same treatment as @math, just above.
-\def\bullet{\implicitmath\ptexbullet\implicitmath}
-\def\minus{\implicitmath-\implicitmath}
+\def\bullet{$\ptexbullet$}
+\def\minus{$-$}
+
+% @dots{} outputs an ellipsis using the current font.
+% We do .5em per period so that it has the same spacing in the cm
+% typewriter fonts as three actual period characters; on the other hand,
+% in other typewriter fonts three periods are wider than 1.5em.  So do
+% whichever is larger.
+%
+\def\dots{%
+  \leavevmode
+  \setbox0=\hbox{...}% get width of three periods
+  \ifdim\wd0 > 1.5em
+    \dimen0 = \wd0
+  \else
+    \dimen0 = 1.5em
+  \fi
+  \hbox to \dimen0{%
+    \hskip 0pt plus.25fil
+    .\hskip 0pt plus1fil
+    .\hskip 0pt plus1fil
+    .\hskip 0pt plus.5fil
+  }%
+}
+
+% @enddots{} is an end-of-sentence ellipsis.
+%
+\def\enddots{%
+  \dots
+  \spacefactor=\endofsentencespacefactor
+}
+
+% @comma{} is so commas can be inserted into text without messing up
+% Texinfo's parsing.
+%
+\let\comma = ,
 
 % @refill is a no-op.
 \let\refill=\relax
@@ -1005,20 +1142,20 @@ where each line of input produces a line of output.}
 % So open here the files we need to have open while reading the input.
 % This makes it possible to make a .fmt file for texinfo.
 \def\setfilename{%
+   \fixbackslash  % Turn off hack to swallow `\input texinfo'.
    \iflinks
-     \readauxfile
+     \tryauxfile
+     % Open the new aux file.  TeX will close it automatically at exit.
+     \immediate\openout\auxfile=\jobname.aux
    \fi % \openindices needs to do some work in any case.
    \openindices
-   \fixbackslash  % Turn off hack to swallow `\input texinfo'.
-   \global\let\setfilename=\comment % Ignore extra @setfilename cmds.
+   \let\setfilename=\comment % Ignore extra @setfilename cmds.
    %
    % If texinfo.cnf is present on the system, read it.
    % Useful for site-wide @afourpaper, etc.
-   % Just to be on the safe side, close the input stream before the \input.
    \openin 1 texinfo.cnf
-   \ifeof1 \let\temp=\relax \else \def\temp{\input texinfo.cnf }\fi
-   \closein1
-   \temp
+   \ifeof 1 \else \input texinfo.cnf \fi
+   \closein 1
    %
    \comment % Ignore the actual filename.
 }
@@ -1054,20 +1191,108 @@ where each line of input produces a line of output.}
 \newif\ifpdf
 \newif\ifpdfmakepagedest
 
+% when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1
+% can be set).  So we test for \relax and 0 as well as \undefined,
+% borrowed from ifpdf.sty.
 \ifx\pdfoutput\undefined
-  \pdffalse
-  \let\pdfmkdest = \gobble
-  \let\pdfurl = \gobble
-  \let\endlink = \relax
-  \let\linkcolor = \relax
-  \let\pdfmakeoutlines = \relax
 \else
-  \pdftrue
-  \pdfoutput = 1
+  \ifx\pdfoutput\relax
+  \else
+    \ifcase\pdfoutput
+    \else
+      \pdftrue
+    \fi
+  \fi
+\fi
+
+% PDF uses PostScript string constants for the names of xref targets,
+% for display in the outlines, and in other places.  Thus, we have to
+% double any backslashes.  Otherwise, a name like "\node" will be
+% interpreted as a newline (\n), followed by o, d, e.  Not good.
+% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
+% (and related messages, the final outcome is that it is up to the TeX
+% user to double the backslashes and otherwise make the string valid, so
+% that's what we do).
+
+% double active backslashes.
+% 
+{\catcode`\@=0 \catcode`\\=\active
+ @gdef@activebackslashdouble{%
+   @catcode`@\=@active
+   @let\=@doublebackslash}
+}
+
+% To handle parens, we must adopt a different approach, since parens are
+% not active characters.  hyperref.dtx (which has the same problem as
+% us) handles it with this amazing macro to replace tokens, with minor
+% changes for Texinfo.  It is included here under the GPL by permission
+% from the author, Heiko Oberdiek.
+% 
+% #1 is the tokens to replace.
+% #2 is the replacement.
+% #3 is the control sequence with the string.
+% 
+\def\HyPsdSubst#1#2#3{%
+  \def\HyPsdReplace##1#1##2\END{%
+    ##1%
+    \ifx\\##2\\%
+    \else
+      #2%
+      \HyReturnAfterFi{%
+        \HyPsdReplace##2\END
+      }%
+    \fi
+  }%
+  \xdef#3{\expandafter\HyPsdReplace#3#1\END}%
+}
+\long\def\HyReturnAfterFi#1\fi{\fi#1}
+
+% #1 is a control sequence in which to do the replacements.
+\def\backslashparens#1{%
+  \xdef#1{#1}% redefine it as its expansion; the definition is simply
+             % \lastnode when called from \setref -> \pdfmkdest.
+  \HyPsdSubst{(}{\realbackslash(}{#1}%
+  \HyPsdSubst{)}{\realbackslash)}{#1}%
+}
+
+\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
+with PDF output, and none of those formats could be found.  (.eps cannot
+be supported due to the design of the PDF format; use regular TeX (DVI
+output) for that.)}
+
+\ifpdf
   \input pdfcolor
+  \pdfcatalog{/PageMode /UseOutlines}
+  %
+  % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
   \def\dopdfimage#1#2#3{%
-    \def\imagewidth{#2}%
-    \def\imageheight{#3}%
+    \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
+    \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
+    %
+    % pdftex (and the PDF format) support .png, .jpg, .pdf (among
+    % others).  Let's try in that order.
+    \let\pdfimgext=\empty
+    \begingroup
+      \openin 1 #1.png \ifeof 1
+        \openin 1 #1.jpg \ifeof 1
+          \openin 1 #1.jpeg \ifeof 1
+            \openin 1 #1.JPG \ifeof 1
+              \openin 1 #1.pdf \ifeof 1
+                \errhelp = \nopdfimagehelp
+                \errmessage{Could not find image file #1 for pdf}%
+              \else \gdef\pdfimgext{pdf}%
+              \fi
+            \else \gdef\pdfimgext{JPG}%
+            \fi
+          \else \gdef\pdfimgext{jpeg}%
+          \fi
+        \else \gdef\pdfimgext{jpg}%
+        \fi
+      \else \gdef\pdfimgext{png}%
+      \fi
+      \closein 1
+    \endgroup
+    %
     % without \immediate, pdftex seg faults when the same image is
     % included twice.  (Version 3.14159-pre-1.0-unofficial-20010704.)
     \ifnum\pdftexversion < 14
@@ -1075,98 +1300,144 @@ where each line of input produces a line of output.}
     \else
       \immediate\pdfximage
     \fi
-      \ifx\empty\imagewidth\else width \imagewidth \fi
-      \ifx\empty\imageheight\else height \imageheight \fi
+      \ifdim \wd0 >0pt width \imagewidth \fi
+      \ifdim \wd2 >0pt height \imageheight \fi
       \ifnum\pdftexversion<13
-         #1.pdf%
+         #1.\pdfimgext
        \else
-         {#1.pdf}%
+         {#1.\pdfimgext}%
        \fi
     \ifnum\pdftexversion < 14 \else
       \pdfrefximage \pdflastximage
     \fi}
-  \def\pdfmkdest#1{{\normalturnoffactive \pdfdest name{#1} xyz}}
+  %
+  \def\pdfmkdest#1{{%
+    % We have to set dummies so commands such as @code, and characters
+    % such as \, aren't expanded when present in a section title.
+    \indexnofonts
+    \turnoffactive
+    \activebackslashdouble
+    \makevalueexpandable
+    \def\pdfdestname{#1}%
+    \backslashparens\pdfdestname
+    \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
+  }}
+  %
+  % used to mark target names; must be expandable.
   \def\pdfmkpgn#1{#1}
-  \let\linkcolor = \Blue  % was Cyan, but that seems light?
+  %
+  % by default, use a color that is dark enough to print on paper as
+  % nearly black, but still distinguishable for online viewing.
+  % (Defined in pdfcolor.tex.)
+  \let\urlcolor = \BrickRed
+  \let\linkcolor = \BrickRed
   \def\endlink{\Black\pdfendlink}
+  %
   % Adding outlines to PDF; macros for calculating structure of outlines
   % come from Petr Olsak
   \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
     \else \csname#1\endcsname \fi}
   \def\advancenumber#1{\tempnum=\expnumber{#1}\relax
-    \advance\tempnum by1
+    \advance\tempnum by 1
     \expandafter\xdef\csname#1\endcsname{\the\tempnum}}
-  \def\pdfmakeoutlines{{%
-    \openin 1 \jobname.toc
-    \ifeof 1\else\begingroup
-      \closein 1
+  %
+  % #1 is the section text, which is what will be displayed in the
+  % outline by the pdf viewer.  #2 is the pdf expression for the number
+  % of subentries (or empty, for subsubsections).  #3 is the node text,
+  % which might be empty if this toc entry had no corresponding node.
+  % #4 is the page number
+  %
+  \def\dopdfoutline#1#2#3#4{%
+    % Generate a link to the node text if that exists; else, use the
+    % page number.  We could generate a destination for the section
+    % text in the case where a section has no node, but it doesn't
+    % seem worth the trouble, since most documents are normally structured.
+    \def\pdfoutlinedest{#3}%
+    \ifx\pdfoutlinedest\empty
+      \def\pdfoutlinedest{#4}%
+    \else
+      % Doubled backslashes in the name.
+      {\activebackslashdouble \xdef\pdfoutlinedest{#3}%
+       \backslashparens\pdfoutlinedest}%
+    \fi
+    %
+    % Also double the backslashes in the display string.
+    {\activebackslashdouble \xdef\pdfoutlinetext{#1}%
+     \backslashparens\pdfoutlinetext}%
+    %
+    \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
+  }
+  %
+  \def\pdfmakeoutlines{%
+    \begingroup
       % Thanh's hack / proper braces in bookmarks
       \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
       \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
       %
-      \def\chapentry ##1##2##3{}
-      \def\secentry ##1##2##3##4{\advancenumber{chap##2}}
-      \def\subsecentry ##1##2##3##4##5{\advancenumber{sec##2.##3}}
-      \def\subsubsecentry ##1##2##3##4##5##6{\advancenumber{subsec##2.##3.##4}}
-      \let\appendixentry = \chapentry
-      \let\unnumbchapentry = \chapentry
-      \let\unnumbsecentry = \secentry
-      \let\unnumbsubsecentry = \subsecentry
-      \let\unnumbsubsubsecentry = \subsubsecentry
-      \input \jobname.toc
-      \def\chapentry ##1##2##3{%
-        \pdfoutline goto name{\pdfmkpgn{##3}}count-\expnumber{chap##2}{##1}}
-      \def\secentry ##1##2##3##4{%
-        \pdfoutline goto name{\pdfmkpgn{##4}}count-\expnumber{sec##2.##3}{##1}}
-      \def\subsecentry ##1##2##3##4##5{%
-        \pdfoutline goto name{\pdfmkpgn{##5}}count-\expnumber{subsec##2.##3.##4}{##1}}
-      \def\subsubsecentry ##1##2##3##4##5##6{%
-        \pdfoutline goto name{\pdfmkpgn{##6}}{##1}}
-      \let\appendixentry = \chapentry
-      \let\unnumbchapentry = \chapentry
-      \let\unnumbsecentry = \secentry
-      \let\unnumbsubsecentry = \subsecentry
-      \let\unnumbsubsubsecentry = \subsubsecentry
+      % Read toc silently, to get counts of subentries for \pdfoutline.
+      \def\numchapentry##1##2##3##4{%
+	\def\thischapnum{##2}%
+	\def\thissecnum{0}%
+	\def\thissubsecnum{0}%
+      }%
+      \def\numsecentry##1##2##3##4{%
+	\advancenumber{chap\thischapnum}%
+	\def\thissecnum{##2}%
+	\def\thissubsecnum{0}%
+      }%
+      \def\numsubsecentry##1##2##3##4{%
+	\advancenumber{sec\thissecnum}%
+	\def\thissubsecnum{##2}%
+      }%
+      \def\numsubsubsecentry##1##2##3##4{%
+	\advancenumber{subsec\thissubsecnum}%
+      }%
+      \def\thischapnum{0}%
+      \def\thissecnum{0}%
+      \def\thissubsecnum{0}%
+      %
+      % use \def rather than \let here because we redefine \chapentry et
+      % al. a second time, below.
+      \def\appentry{\numchapentry}%
+      \def\appsecentry{\numsecentry}%
+      \def\appsubsecentry{\numsubsecentry}%
+      \def\appsubsubsecentry{\numsubsubsecentry}%
+      \def\unnchapentry{\numchapentry}%
+      \def\unnsecentry{\numsecentry}%
+      \def\unnsubsecentry{\numsubsecentry}%
+      \def\unnsubsubsecentry{\numsubsubsecentry}%
+      \readdatafile{toc}%
       %
-      % Make special characters normal for writing to the pdf file.
+      % Read toc second time, this time actually producing the outlines.
+      % The `-' means take the \expnumber as the absolute number of
+      % subentries, which we calculated on our first read of the .toc above.
       %
+      % We use the node names as the destinations.
+      \def\numchapentry##1##2##3##4{%
+        \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}%
+      \def\numsecentry##1##2##3##4{%
+        \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}%
+      \def\numsubsecentry##1##2##3##4{%
+        \dopdfoutline{##1}{count-\expnumber{subsec##2}}{##3}{##4}}%
+      \def\numsubsubsecentry##1##2##3##4{% count is always zero
+        \dopdfoutline{##1}{}{##3}{##4}}%
+      %
+      % PDF outlines are displayed using system fonts, instead of
+      % document fonts.  Therefore we cannot use special characters,
+      % since the encoding is unknown.  For example, the eogonek from
+      % Latin 2 (0xea) gets translated to a | character.  Info from
+      % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100.
+      %
+      % xx to do this right, we have to translate 8-bit characters to
+      % their "best" equivalent, based on the @documentencoding.  Right
+      % now, I guess we'll just let the pdf reader have its way.
       \indexnofonts
-      \let\tt=\relax
-      \turnoffactive
+      \setupdatafile
+      \catcode`\\=\active \otherbackslash
       \input \jobname.toc
-    \endgroup\fi
-  }}
-  \def\makelinks #1,{%
-    \def\params{#1}\def\E{END}%
-    \ifx\params\E
-      \let\nextmakelinks=\relax
-    \else
-      \let\nextmakelinks=\makelinks
-      \ifnum\lnkcount>0,\fi
-      \picknum{#1}%
-      \startlink attr{/Border [0 0 0]}
-        goto name{\pdfmkpgn{\the\pgn}}%
-      \linkcolor #1%
-      \advance\lnkcount by 1%
-      \endlink
-    \fi
-    \nextmakelinks
-  }
-  \def\picknum#1{\expandafter\pn#1}
-  \def\pn#1{%
-    \def\p{#1}%
-    \ifx\p\lbrace
-      \let\nextpn=\ppn
-    \else
-      \let\nextpn=\ppnn
-      \def\first{#1}
-    \fi
-    \nextpn
+    \endgroup
   }
-  \def\ppn#1{\pgn=#1\gobble}
-  \def\ppnn{\pgn=\first}
-  \def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,}
-  \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
+  %
   \def\skipspaces#1{\def\PP{#1}\def\D{|}%
     \ifx\PP\D\let\nextsp\relax
     \else\let\nextsp\skipspaces
@@ -1181,21 +1452,28 @@ where each line of input produces a line of output.}
   \else
     \let \startlink \pdfstartlink
   \fi
+  % make a live url in pdf output.
   \def\pdfurl#1{%
     \begingroup
-      \normalturnoffactive\def\@{@}%
-      \let\value=\expandablevalue
-      \leavevmode\Red
+      % it seems we really need yet another set of dummies; have not
+      % tried to figure out what each command should do in the context
+      % of @url.  for now, just make @/ a no-op, that's the only one
+      % people have actually reported a problem with.
+      % 
+      \normalturnoffactive
+      \def\@{@}%
+      \let\/=\empty
+      \makevalueexpandable
+      \leavevmode\urlcolor
       \startlink attr{/Border [0 0 0]}%
         user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
-        % #1
     \endgroup}
   \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}}
   \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
   \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks}
   \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}}
   \def\maketoks{%
-    \expandafter\poptoks\the\toksA|ENDTOKS|
+    \expandafter\poptoks\the\toksA|ENDTOKS|\relax
     \ifx\first0\adn0
     \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
     \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6
@@ -1215,20 +1493,45 @@ where each line of input produces a line of output.}
     \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}}
     \linkcolor #1\endlink}
   \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
-\fi % \ifx\pdfoutput
+\else
+  \let\pdfmkdest = \gobble
+  \let\pdfurl = \gobble
+  \let\endlink = \relax
+  \let\linkcolor = \relax
+  \let\pdfmakeoutlines = \relax
+\fi  % \ifx\pdfoutput
 
 
 \message{fonts,}
-% Font-change commands.
+
+% Change the current font style to #1, remembering it in \curfontstyle.
+% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in
+% italics, not bold italics.
+%
+\def\setfontstyle#1{%
+  \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd.
+  \csname ten#1\endcsname  % change the current font
+}
+
+% Select #1 fonts with the current style.
+%
+\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname}
+
+\def\rm{\fam=0 \setfontstyle{rm}}
+\def\it{\fam=\itfam \setfontstyle{it}}
+\def\sl{\fam=\slfam \setfontstyle{sl}}
+\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf}
+\def\tt{\fam=\ttfam \setfontstyle{tt}}
 
 % Texinfo sort of supports the sans serif font style, which plain TeX does not.
-% So we set up a \sf analogous to plain's \rm, etc.
+% So we set up a \sf.
 \newfam\sffam
-\def\sf{\fam=\sffam \tensf}
+\def\sf{\fam=\sffam \setfontstyle{sf}}
 \let\li = \sf % Sometimes we call it \li, not \sf.
 
-% We don't need math for this one.
-\def\ttsl{\tenttsl}
+% We don't need math for this font style.
+\def\ttsl{\setfontstyle{ttsl}}
+
 
 % Default leading.
 \newdimen\textleading  \textleading = 13.2pt
@@ -1251,10 +1554,277 @@ where each line of input produces a line of output.}
   }%
 }
 
+%
+% PDF CMaps.  See also LaTeX's t1.cmap.
+%
+% \cmapOT1
+\ifpdf
+  \begingroup
+    \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
+    \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-OT1-0)
+%%Title: (TeX-OT1-0 TeX OT1 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (OT1)
+/Supplement 0
+>> def
+/CMapName /TeX-OT1-0 def
+/CMapType 2 def
+1 begincodespacerange
+<00> <7F>
+endcodespacerange
+8 beginbfrange
+<00> <01> <0393>
+<09> <0A> <03A8>
+<23> <26> <0023>
+<28> <3B> <0028>
+<3F> <5B> <003F>
+<5D> <5E> <005D>
+<61> <7A> <0061>
+<7B> <7C> <2013>
+endbfrange
+40 beginbfchar
+<02> <0398>
+<03> <039B>
+<04> <039E>
+<05> <03A0>
+<06> <03A3>
+<07> <03D2>
+<08> <03A6>
+<0B> <00660066>
+<0C> <00660069>
+<0D> <0066006C>
+<0E> <006600660069>
+<0F> <00660066006C>
+<10> <0131>
+<11> <0237>
+<12> <0060>
+<13> <00B4>
+<14> <02C7>
+<15> <02D8>
+<16> <00AF>
+<17> <02DA>
+<18> <00B8>
+<19> <00DF>
+<1A> <00E6>
+<1B> <0153>
+<1C> <00F8>
+<1D> <00C6>
+<1E> <0152>
+<1F> <00D8>
+<21> <0021>
+<22> <201D>
+<27> <2019>
+<3C> <00A1>
+<3D> <003D>
+<3E> <00BF>
+<5C> <201C>
+<5F> <02D9>
+<60> <2018>
+<7D> <02DD>
+<7E> <007E>
+<7F> <00A8>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+    }\endgroup
+  \expandafter\edef\csname cmapOT1\endcsname#1{%
+    \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
+  }%
+%
+% \cmapOT1IT
+  \begingroup
+    \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
+    \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-OT1IT-0)
+%%Title: (TeX-OT1IT-0 TeX OT1IT 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (OT1IT)
+/Supplement 0
+>> def
+/CMapName /TeX-OT1IT-0 def
+/CMapType 2 def
+1 begincodespacerange
+<00> <7F>
+endcodespacerange
+8 beginbfrange
+<00> <01> <0393>
+<09> <0A> <03A8>
+<25> <26> <0025>
+<28> <3B> <0028>
+<3F> <5B> <003F>
+<5D> <5E> <005D>
+<61> <7A> <0061>
+<7B> <7C> <2013>
+endbfrange
+42 beginbfchar
+<02> <0398>
+<03> <039B>
+<04> <039E>
+<05> <03A0>
+<06> <03A3>
+<07> <03D2>
+<08> <03A6>
+<0B> <00660066>
+<0C> <00660069>
+<0D> <0066006C>
+<0E> <006600660069>
+<0F> <00660066006C>
+<10> <0131>
+<11> <0237>
+<12> <0060>
+<13> <00B4>
+<14> <02C7>
+<15> <02D8>
+<16> <00AF>
+<17> <02DA>
+<18> <00B8>
+<19> <00DF>
+<1A> <00E6>
+<1B> <0153>
+<1C> <00F8>
+<1D> <00C6>
+<1E> <0152>
+<1F> <00D8>
+<21> <0021>
+<22> <201D>
+<23> <0023>
+<24> <00A3>
+<27> <2019>
+<3C> <00A1>
+<3D> <003D>
+<3E> <00BF>
+<5C> <201C>
+<5F> <02D9>
+<60> <2018>
+<7D> <02DD>
+<7E> <007E>
+<7F> <00A8>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+    }\endgroup
+  \expandafter\edef\csname cmapOT1IT\endcsname#1{%
+    \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
+  }%
+%
+% \cmapOT1TT
+  \begingroup
+    \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
+    \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-OT1TT-0)
+%%Title: (TeX-OT1TT-0 TeX OT1TT 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (OT1TT)
+/Supplement 0
+>> def
+/CMapName /TeX-OT1TT-0 def
+/CMapType 2 def
+1 begincodespacerange
+<00> <7F>
+endcodespacerange
+5 beginbfrange
+<00> <01> <0393>
+<09> <0A> <03A8>
+<21> <26> <0021>
+<28> <5F> <0028>
+<61> <7E> <0061>
+endbfrange
+32 beginbfchar
+<02> <0398>
+<03> <039B>
+<04> <039E>
+<05> <03A0>
+<06> <03A3>
+<07> <03D2>
+<08> <03A6>
+<0B> <2191>
+<0C> <2193>
+<0D> <0027>
+<0E> <00A1>
+<0F> <00BF>
+<10> <0131>
+<11> <0237>
+<12> <0060>
+<13> <00B4>
+<14> <02C7>
+<15> <02D8>
+<16> <00AF>
+<17> <02DA>
+<18> <00B8>
+<19> <00DF>
+<1A> <00E6>
+<1B> <0153>
+<1C> <00F8>
+<1D> <00C6>
+<1E> <0152>
+<1F> <00D8>
+<20> <2423>
+<27> <2019>
+<60> <2018>
+<7F> <00A8>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+    }\endgroup
+  \expandafter\edef\csname cmapOT1TT\endcsname#1{%
+    \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
+  }%
+\else
+  \expandafter\let\csname cmapOT1\endcsname\gobble
+  \expandafter\let\csname cmapOT1IT\endcsname\gobble
+  \expandafter\let\csname cmapOT1TT\endcsname\gobble
+\fi
+
+
 % Set the font macro #1 to the font named #2, adding on the
 % specified font prefix (normally `cm').
-% #3 is the font's design size, #4 is a scale factor
-\def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
+% #3 is the font's design size, #4 is a scale factor, #5 is the CMap
+% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass
+% empty to omit).
+\def\setfont#1#2#3#4#5{%
+  \font#1=\fontprefix#2#3 scaled #4
+  \csname cmap#5\endcsname#1%
+}
+% This is what gets called when #5 of \setfont is empty.
+\let\cmap\gobble
+
 
 % Use cm as the default font prefix.
 % To specify the font prefix, you must define \fontprefix
@@ -1279,110 +1849,281 @@ where each line of input produces a line of output.}
 \def\scshape{csc}
 \def\scbshape{csc}
 
-\newcount\mainmagstep
-\ifx\bigger\relax
-  % not really supported.
-  \mainmagstep=\magstep1
-  \setfont\textrm\rmshape{12}{1000}
-  \setfont\texttt\ttshape{12}{1000}
-\else
-  \mainmagstep=\magstephalf
-  \setfont\textrm\rmshape{10}{\mainmagstep}
-  \setfont\texttt\ttshape{10}{\mainmagstep}
-\fi
-% Instead of cmb10, you may want to use cmbx10.
-% cmbx10 is a prettier font on its own, but cmb10
-% looks better when embedded in a line with cmr10
-% (in Bob's opinion).
-\setfont\textbf\bfshape{10}{\mainmagstep}
-\setfont\textit\itshape{10}{\mainmagstep}
-\setfont\textsl\slshape{10}{\mainmagstep}
-\setfont\textsf\sfshape{10}{\mainmagstep}
-\setfont\textsc\scshape{10}{\mainmagstep}
-\setfont\textttsl\ttslshape{10}{\mainmagstep}
+% Definitions for a main text size of 11pt.  This is the default in
+% Texinfo.
+% 
+\def\definetextfontsizexi{%
+% Text fonts (11.2pt, magstep1).
+\def\textnominalsize{11pt}
+\edef\mainmagstep{\magstephalf}
+\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
+\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
+\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
+\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
+\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
+\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
+\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
+\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
 \font\texti=cmmi10 scaled \mainmagstep
 \font\textsy=cmsy10 scaled \mainmagstep
 
-% A few fonts for @defun, etc.
-\setfont\defbf\bxshape{10}{\magstep1} %was 1314
-\setfont\deftt\ttshape{10}{\magstep1}
-\def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf}
+% A few fonts for @defun names and args.
+\setfont\defbf\bfshape{10}{\magstep1}{OT1}
+\setfont\deftt\ttshape{10}{\magstep1}{OT1TT}
+\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT}
+\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
 
 % Fonts for indices, footnotes, small examples (9pt).
-\setfont\smallrm\rmshape{9}{1000}
-\setfont\smalltt\ttshape{9}{1000}
-\setfont\smallbf\bfshape{10}{900}
-\setfont\smallit\itshape{9}{1000}
-\setfont\smallsl\slshape{9}{1000}
-\setfont\smallsf\sfshape{9}{1000}
-\setfont\smallsc\scshape{10}{900}
-\setfont\smallttsl\ttslshape{10}{900}
+\def\smallnominalsize{9pt}
+\setfont\smallrm\rmshape{9}{1000}{OT1}
+\setfont\smalltt\ttshape{9}{1000}{OT1TT}
+\setfont\smallbf\bfshape{10}{900}{OT1}
+\setfont\smallit\itshape{9}{1000}{OT1IT}
+\setfont\smallsl\slshape{9}{1000}{OT1}
+\setfont\smallsf\sfshape{9}{1000}{OT1}
+\setfont\smallsc\scshape{10}{900}{OT1}
+\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
 \font\smalli=cmmi9
 \font\smallsy=cmsy9
 
 % Fonts for small examples (8pt).
-\setfont\smallerrm\rmshape{8}{1000}
-\setfont\smallertt\ttshape{8}{1000}
-\setfont\smallerbf\bfshape{10}{800}
-\setfont\smallerit\itshape{8}{1000}
-\setfont\smallersl\slshape{8}{1000}
-\setfont\smallersf\sfshape{8}{1000}
-\setfont\smallersc\scshape{10}{800}
-\setfont\smallerttsl\ttslshape{10}{800}
+\def\smallernominalsize{8pt}
+\setfont\smallerrm\rmshape{8}{1000}{OT1}
+\setfont\smallertt\ttshape{8}{1000}{OT1TT}
+\setfont\smallerbf\bfshape{10}{800}{OT1}
+\setfont\smallerit\itshape{8}{1000}{OT1IT}
+\setfont\smallersl\slshape{8}{1000}{OT1}
+\setfont\smallersf\sfshape{8}{1000}{OT1}
+\setfont\smallersc\scshape{10}{800}{OT1}
+\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
 \font\smalleri=cmmi8
 \font\smallersy=cmsy8
 
-% Fonts for title page:
-\setfont\titlerm\rmbshape{12}{\magstep3}
-\setfont\titleit\itbshape{10}{\magstep4}
-\setfont\titlesl\slbshape{10}{\magstep4}
-\setfont\titlett\ttbshape{12}{\magstep3}
-\setfont\titlettsl\ttslshape{10}{\magstep4}
-\setfont\titlesf\sfbshape{17}{\magstep1}
+% Fonts for title page (20.4pt):
+\def\titlenominalsize{20pt}
+\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
+\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
+\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
+\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
+\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
+\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
 \let\titlebf=\titlerm
-\setfont\titlesc\scbshape{10}{\magstep4}
+\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
 \font\titlei=cmmi12 scaled \magstep3
 \font\titlesy=cmsy10 scaled \magstep4
 \def\authorrm{\secrm}
 \def\authortt{\sectt}
 
 % Chapter (and unnumbered) fonts (17.28pt).
-\setfont\chaprm\rmbshape{12}{\magstep2}
-\setfont\chapit\itbshape{10}{\magstep3}
-\setfont\chapsl\slbshape{10}{\magstep3}
-\setfont\chaptt\ttbshape{12}{\magstep2}
-\setfont\chapttsl\ttslshape{10}{\magstep3}
-\setfont\chapsf\sfbshape{17}{1000}
+\def\chapnominalsize{17pt}
+\setfont\chaprm\rmbshape{12}{\magstep2}{OT1}
+\setfont\chapit\itbshape{10}{\magstep3}{OT1IT}
+\setfont\chapsl\slbshape{10}{\magstep3}{OT1}
+\setfont\chaptt\ttbshape{12}{\magstep2}{OT1TT}
+\setfont\chapttsl\ttslshape{10}{\magstep3}{OT1TT}
+\setfont\chapsf\sfbshape{17}{1000}{OT1}
 \let\chapbf=\chaprm
-\setfont\chapsc\scbshape{10}{\magstep3}
+\setfont\chapsc\scbshape{10}{\magstep3}{OT1}
 \font\chapi=cmmi12 scaled \magstep2
 \font\chapsy=cmsy10 scaled \magstep3
 
 % Section fonts (14.4pt).
-\setfont\secrm\rmbshape{12}{\magstep1}
-\setfont\secit\itbshape{10}{\magstep2}
-\setfont\secsl\slbshape{10}{\magstep2}
-\setfont\sectt\ttbshape{12}{\magstep1}
-\setfont\secttsl\ttslshape{10}{\magstep2}
-\setfont\secsf\sfbshape{12}{\magstep1}
+\def\secnominalsize{14pt}
+\setfont\secrm\rmbshape{12}{\magstep1}{OT1}
+\setfont\secit\itbshape{10}{\magstep2}{OT1IT}
+\setfont\secsl\slbshape{10}{\magstep2}{OT1}
+\setfont\sectt\ttbshape{12}{\magstep1}{OT1TT}
+\setfont\secttsl\ttslshape{10}{\magstep2}{OT1TT}
+\setfont\secsf\sfbshape{12}{\magstep1}{OT1}
 \let\secbf\secrm
-\setfont\secsc\scbshape{10}{\magstep2}
+\setfont\secsc\scbshape{10}{\magstep2}{OT1}
 \font\seci=cmmi12 scaled \magstep1
 \font\secsy=cmsy10 scaled \magstep2
 
 % Subsection fonts (13.15pt).
-\setfont\ssecrm\rmbshape{12}{\magstephalf}
-\setfont\ssecit\itbshape{10}{1315}
-\setfont\ssecsl\slbshape{10}{1315}
-\setfont\ssectt\ttbshape{12}{\magstephalf}
-\setfont\ssecttsl\ttslshape{10}{1315}
-\setfont\ssecsf\sfbshape{12}{\magstephalf}
+\def\ssecnominalsize{13pt}
+\setfont\ssecrm\rmbshape{12}{\magstephalf}{OT1}
+\setfont\ssecit\itbshape{10}{1315}{OT1IT}
+\setfont\ssecsl\slbshape{10}{1315}{OT1}
+\setfont\ssectt\ttbshape{12}{\magstephalf}{OT1TT}
+\setfont\ssecttsl\ttslshape{10}{1315}{OT1TT}
+\setfont\ssecsf\sfbshape{12}{\magstephalf}{OT1}
 \let\ssecbf\ssecrm
-\setfont\ssecsc\scbshape{10}{\magstep1}
+\setfont\ssecsc\scbshape{10}{1315}{OT1}
 \font\sseci=cmmi12 scaled \magstephalf
 \font\ssecsy=cmsy10 scaled 1315
-% The smallcaps and symbol fonts should actually be scaled \magstep1.5,
-% but that is not a standard magnification.
+
+% Reduced fonts for @acro in text (10pt).
+\def\reducednominalsize{10pt}
+\setfont\reducedrm\rmshape{10}{1000}{OT1}
+\setfont\reducedtt\ttshape{10}{1000}{OT1TT}
+\setfont\reducedbf\bfshape{10}{1000}{OT1}
+\setfont\reducedit\itshape{10}{1000}{OT1IT}
+\setfont\reducedsl\slshape{10}{1000}{OT1}
+\setfont\reducedsf\sfshape{10}{1000}{OT1}
+\setfont\reducedsc\scshape{10}{1000}{OT1}
+\setfont\reducedttsl\ttslshape{10}{1000}{OT1TT}
+\font\reducedi=cmmi10
+\font\reducedsy=cmsy10
+
+% reset the current fonts
+\textfonts
+\rm
+} % end of 11pt text font size definitions
+
+
+% Definitions to make the main text be 10pt Computer Modern, with
+% section, chapter, etc., sizes following suit.  This is for the GNU
+% Press printing of the Emacs 22 manual.  Maybe other manuals in the
+% future.  Used with @smallbook, which sets the leading to 12pt.
+% 
+\def\definetextfontsizex{%
+% Text fonts (10pt).
+\def\textnominalsize{10pt}
+\edef\mainmagstep{1000}
+\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
+\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
+\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
+\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
+\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
+\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
+\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
+\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
+\font\texti=cmmi10 scaled \mainmagstep
+\font\textsy=cmsy10 scaled \mainmagstep
+
+% A few fonts for @defun names and args.
+\setfont\defbf\bfshape{10}{\magstephalf}{OT1}
+\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT}
+\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT}
+\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
+
+% Fonts for indices, footnotes, small examples (9pt).
+\def\smallnominalsize{9pt}
+\setfont\smallrm\rmshape{9}{1000}{OT1}
+\setfont\smalltt\ttshape{9}{1000}{OT1TT}
+\setfont\smallbf\bfshape{10}{900}{OT1}
+\setfont\smallit\itshape{9}{1000}{OT1IT}
+\setfont\smallsl\slshape{9}{1000}{OT1}
+\setfont\smallsf\sfshape{9}{1000}{OT1}
+\setfont\smallsc\scshape{10}{900}{OT1}
+\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
+\font\smalli=cmmi9
+\font\smallsy=cmsy9
+
+% Fonts for small examples (8pt).
+\def\smallernominalsize{8pt}
+\setfont\smallerrm\rmshape{8}{1000}{OT1}
+\setfont\smallertt\ttshape{8}{1000}{OT1TT}
+\setfont\smallerbf\bfshape{10}{800}{OT1}
+\setfont\smallerit\itshape{8}{1000}{OT1IT}
+\setfont\smallersl\slshape{8}{1000}{OT1}
+\setfont\smallersf\sfshape{8}{1000}{OT1}
+\setfont\smallersc\scshape{10}{800}{OT1}
+\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
+\font\smalleri=cmmi8
+\font\smallersy=cmsy8
+
+% Fonts for title page (20.4pt):
+\def\titlenominalsize{20pt}
+\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
+\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
+\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
+\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
+\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
+\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
+\let\titlebf=\titlerm
+\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
+\font\titlei=cmmi12 scaled \magstep3
+\font\titlesy=cmsy10 scaled \magstep4
+\def\authorrm{\secrm}
+\def\authortt{\sectt}
+
+% Chapter fonts (14.4pt).
+\def\chapnominalsize{14pt}
+\setfont\chaprm\rmbshape{12}{\magstep1}{OT1}
+\setfont\chapit\itbshape{10}{\magstep2}{OT1IT}
+\setfont\chapsl\slbshape{10}{\magstep2}{OT1}
+\setfont\chaptt\ttbshape{12}{\magstep1}{OT1TT}
+\setfont\chapttsl\ttslshape{10}{\magstep2}{OT1TT}
+\setfont\chapsf\sfbshape{12}{\magstep1}{OT1}
+\let\chapbf\chaprm
+\setfont\chapsc\scbshape{10}{\magstep2}{OT1}
+\font\chapi=cmmi12 scaled \magstep1
+\font\chapsy=cmsy10 scaled \magstep2
+
+% Section fonts (12pt).
+\def\secnominalsize{12pt}
+\setfont\secrm\rmbshape{12}{1000}{OT1}
+\setfont\secit\itbshape{10}{\magstep1}{OT1IT}
+\setfont\secsl\slbshape{10}{\magstep1}{OT1}
+\setfont\sectt\ttbshape{12}{1000}{OT1TT}
+\setfont\secttsl\ttslshape{10}{\magstep1}{OT1TT}
+\setfont\secsf\sfbshape{12}{1000}{OT1}
+\let\secbf\secrm
+\setfont\secsc\scbshape{10}{\magstep1}{OT1}
+\font\seci=cmmi12 
+\font\secsy=cmsy10 scaled \magstep1
+
+% Subsection fonts (10pt).
+\def\ssecnominalsize{10pt}
+\setfont\ssecrm\rmbshape{10}{1000}{OT1}
+\setfont\ssecit\itbshape{10}{1000}{OT1IT}
+\setfont\ssecsl\slbshape{10}{1000}{OT1}
+\setfont\ssectt\ttbshape{10}{1000}{OT1TT}
+\setfont\ssecttsl\ttslshape{10}{1000}{OT1TT}
+\setfont\ssecsf\sfbshape{10}{1000}{OT1}
+\let\ssecbf\ssecrm
+\setfont\ssecsc\scbshape{10}{1000}{OT1}
+\font\sseci=cmmi10
+\font\ssecsy=cmsy10
+
+% Reduced fonts for @acro in text (9pt).
+\def\reducednominalsize{9pt}
+\setfont\reducedrm\rmshape{9}{1000}{OT1}
+\setfont\reducedtt\ttshape{9}{1000}{OT1TT}
+\setfont\reducedbf\bfshape{10}{900}{OT1}
+\setfont\reducedit\itshape{9}{1000}{OT1IT}
+\setfont\reducedsl\slshape{9}{1000}{OT1}
+\setfont\reducedsf\sfshape{9}{1000}{OT1}
+\setfont\reducedsc\scshape{10}{900}{OT1}
+\setfont\reducedttsl\ttslshape{10}{900}{OT1TT}
+\font\reducedi=cmmi9
+\font\reducedsy=cmsy9
+
+% reduce space between paragraphs
+\divide\parskip by 2
+
+% reset the current fonts
+\textfonts
+\rm
+} % end of 10pt text font size definitions
+
+
+% We provide the user-level command
+%   @fonttextsize 10
+% (or 11) to redefine the text font size.  pt is assumed.
+% 
+\def\xword{10}
+\def\xiword{11}
+%
+\parseargdef\fonttextsize{%
+  \def\textsizearg{#1}%
+  \wlog{doing @fonttextsize \textsizearg}%
+  %
+  % Set \globaldefs so that documents can use this inside @tex, since
+  % makeinfo 4.8 does not support it, but we need it nonetheless.
+  % 
+ \begingroup \globaldefs=1
+  \ifx\textsizearg\xword \definetextfontsizex
+  \else \ifx\textsizearg\xiword \definetextfontsizexi
+  \else
+    \errhelp=\EMsimple
+    \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'}
+  \fi\fi
+ \endgroup
+}
+
 
 % In order for the font changes to affect most math symbols and letters,
 % we have to define the \textfont of the standard families.  Since
@@ -1397,50 +2138,81 @@ where each line of input produces a line of output.}
 }
 
 % The font-changing commands redefine the meanings of \tenSTYLE, instead
-% of just \STYLE.  We do this so that font changes will continue to work
-% in math mode, where it is the current \fam that is relevant in most
-% cases, not the current font.  Plain TeX does \def\bf{\fam=\bffam
-% \tenbf}, for example.  By redefining \tenbf, we obviate the need to
-% redefine \bf itself.
+% of just \STYLE.  We do this because \STYLE needs to also set the
+% current \fam for math mode.  Our \STYLE (e.g., \rm) commands hardwire
+% \tenSTYLE to set the current font.
+%
+% Each font-changing command also sets the names \lsize (one size lower)
+% and \lllsize (three sizes lower).  These relative commands are used in
+% the LaTeX logo and acronyms.
+%
+% This all needs generalizing, badly.
+%
 \def\textfonts{%
   \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl
   \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc
-  \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy \let\tenttsl=\textttsl
+  \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy
+  \let\tenttsl=\textttsl
+  \def\curfontsize{text}%
+  \def\lsize{reduced}\def\lllsize{smaller}%
   \resetmathfonts \setleading{\textleading}}
 \def\titlefonts{%
   \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl
   \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc
   \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy
   \let\tenttsl=\titlettsl
+  \def\curfontsize{title}%
+  \def\lsize{chap}\def\lllsize{subsec}%
   \resetmathfonts \setleading{25pt}}
 \def\titlefont#1{{\titlefonts\rm #1}}
 \def\chapfonts{%
   \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
   \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc
-  \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy \let\tenttsl=\chapttsl
+  \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy
+  \let\tenttsl=\chapttsl
+  \def\curfontsize{chap}%
+  \def\lsize{sec}\def\lllsize{text}%
   \resetmathfonts \setleading{19pt}}
 \def\secfonts{%
   \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl
   \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc
-  \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy \let\tenttsl=\secttsl
+  \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy
+  \let\tenttsl=\secttsl
+  \def\curfontsize{sec}%
+  \def\lsize{subsec}\def\lllsize{reduced}%
   \resetmathfonts \setleading{16pt}}
 \def\subsecfonts{%
   \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl
   \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
-  \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy \let\tenttsl=\ssecttsl
+  \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy
+  \let\tenttsl=\ssecttsl
+  \def\curfontsize{ssec}%
+  \def\lsize{text}\def\lllsize{small}%
   \resetmathfonts \setleading{15pt}}
-\let\subsubsecfonts = \subsecfonts % Maybe make sssec fonts scaled magstephalf?
+\let\subsubsecfonts = \subsecfonts
+\def\reducedfonts{%
+  \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl
+  \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc
+  \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy
+  \let\tenttsl=\reducedttsl
+  \def\curfontsize{reduced}%
+  \def\lsize{small}\def\lllsize{smaller}%
+  \resetmathfonts \setleading{10.5pt}}
 \def\smallfonts{%
   \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl
   \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc
   \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy
   \let\tenttsl=\smallttsl
+  \def\curfontsize{small}%
+  \def\lsize{smaller}\def\lllsize{smaller}%
   \resetmathfonts \setleading{10.5pt}}
 \def\smallerfonts{%
   \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl
   \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc
   \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy
   \let\tenttsl=\smallerttsl
+  \def\curfontsize{smaller}%
+  \def\lsize{smaller}\def\lllsize{smaller}%
   \resetmathfonts \setleading{9.5pt}}
 
 % Set the fonts to use with the @small... environments.
@@ -1449,7 +2221,7 @@ where each line of input produces a line of output.}
 % About \smallexamplefonts.  If we use \smallfonts (9pt), @smallexample
 % can fit this many characters:
 %   8.5x11=86   smallbook=72  a4=90  a5=69
-% If we use \smallerfonts (8pt), then we can fit this many characters:
+% If we use \scriptfonts (8pt), then we can fit this many characters:
 %   8.5x11=90+  smallbook=80  a4=90+  a5=77
 % For me, subjectively, the few extra characters that fit aren't worth
 % the additional smallness of 8pt.  So I'm making the default 9pt.
@@ -1457,14 +2229,13 @@ where each line of input produces a line of output.}
 % By the way, for comparison, here's what fits with @example (10pt):
 %   8.5x11=71  smallbook=60  a4=75  a5=58
 %
-% I wish we used A4 paper on this side of the Atlantic.
-%
+% I wish the USA used A4 paper.
 % --karl, 24jan03.
 
 
 % Set up the default fonts, so we can use them for creating boxes.
 %
-\textfonts
+\definetextfontsizexi
 
 % Define these so they can be easily changed for other fonts.
 \def\angleleft{$\langle$}
@@ -1474,10 +2245,10 @@ where each line of input produces a line of output.}
 \newcount\fontdepth \fontdepth=0
 
 % Fonts for short table of contents.
-\setfont\shortcontrm\rmshape{12}{1000}
-\setfont\shortcontbf\bxshape{12}{1000}
-\setfont\shortcontsl\slshape{12}{1000}
-\setfont\shortconttt\ttshape{12}{1000}
+\setfont\shortcontrm\rmshape{12}{1000}{OT1}
+\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1}  % no cmb12
+\setfont\shortcontsl\slshape{12}{1000}{OT1}
+\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
 
 %% Add scribe-like font environments, plus @l for inline lisp (usually sans
 %% serif) and @ii for TeX italic
@@ -1489,15 +2260,27 @@ where each line of input produces a line of output.}
 \def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx}
 \def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx}
 
+% like \smartslanted except unconditionally uses \ttsl.
+% @var is set to this for defun arguments.
+\def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx}
+
+% like \smartslanted except unconditionally use \sl.  We never want
+% ttsl for book titles, do we?
+\def\cite#1{{\sl #1}\futurelet\next\smartitalicx}
+
 \let\i=\smartitalic
+\let\slanted=\smartslanted
 \let\var=\smartslanted
 \let\dfn=\smartslanted
 \let\emph=\smartitalic
-\let\cite=\smartslanted
 
+% @b, explicit bold.
 \def\b#1{{\bf #1}}
 \let\strong=\b
 
+% @sansserif, explicit sans.
+\def\sansserif#1{{\sf #1}}
+
 % We can't just use \exhyphenpenalty, because that only has effect at
 % the end of a paragraph.  Restore normal hyphenation at the end of the
 % group within which \nohyphenation is presumably called.
@@ -1510,19 +2293,25 @@ where each line of input produces a line of output.}
 % sometimes \x has an active definition that messes things up.
 %
 \catcode`@=11
-  \def\frenchspacing{%
+  \def\plainfrenchspacing{%
     \sfcode\dotChar  =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m
     \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m
+    \def\endofsentencespacefactor{1000}% for @. and friends
+  }
+  \def\plainnonfrenchspacing{%
+    \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000
+    \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250
+    \def\endofsentencespacefactor{3000}% for @. and friends
   }
 \catcode`@=\other
+\def\endofsentencespacefactor{3000}% default
 
 \def\t#1{%
-  {\tt \rawbackslash \frenchspacing #1}%
+  {\tt \rawbackslash \plainfrenchspacing #1}%
   \null
 }
-\let\ttfont=\t
 \def\samp#1{`\tclose{#1}'\null}
-\setfont\keyrm\rmshape{8}{1000}
+\setfont\keyrm\rmshape{8}{1000}{OT1}
 \font\keysy=cmsy9
 \def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
   \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
@@ -1530,6 +2319,7 @@ where each line of input produces a line of output.}
      \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
     \kern-0.4pt\hrule}%
   \kern-.06em\raise0.4pt\hbox{\angleright}}}}
+\def\key #1{{\nohyphenation \uppercase{#1}}\null}
 % The old definition, with no lozenge:
 %\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
 \def\ctrl #1{{\tt \rawbackslash \hat}#1}
@@ -1555,13 +2345,13 @@ where each line of input produces a line of output.}
     \nohyphenation
     %
     \rawbackslash
-    \frenchspacing
+    \plainfrenchspacing
     #1%
   }%
   \null
 }
 
-% We *must* turn on hyphenation at `-' and `_' in \code.
+% We *must* turn on hyphenation at `-' and `_' in @code.
 % Otherwise, it is too hard to avoid overfull hboxes
 % in the Emacs manual, the Library manual, etc.
 
@@ -1571,18 +2361,23 @@ where each line of input produces a line of output.}
 % and arrange explicitly to hyphenate at a dash.
 %  -- rms.
 {
-  \catcode`\-=\active
-  \catcode`\_=\active
+  \catcode`\-=\active \catcode`\_=\active
+  \catcode`\'=\active \catcode`\`=\active
   %
   \global\def\code{\begingroup
-    \catcode`\-=\active \let-\codedash
-    \catcode`\_=\active \let_\codeunder
+    \catcode\rquoteChar=\active \catcode\lquoteChar=\active
+    \let'\codequoteright \let`\codequoteleft
+    %
+    \catcode\dashChar=\active  \catcode\underChar=\active
+    \ifallowcodebreaks
+     \let-\codedash
+     \let_\codeunder
+    \else
+     \let-\realdash
+     \let_\realunder
+    \fi
     \codex
   }
-  %
-  % If we end up with any active - characters when handling the index,
-  % just treat them as a normal -.
-  \global\def\indexbreaks{\catcode`\-=\active \let-\realdash}
 }
 
 \def\realdash{-}
@@ -1600,24 +2395,45 @@ where each line of input produces a line of output.}
 }
 \def\codex #1{\tclose{#1}\endgroup}
 
+% An additional complication: the above will allow breaks after, e.g.,
+% each of the four underscores in __typeof__.  This is undesirable in
+% some manuals, especially if they don't have long identifiers in
+% general.  @allowcodebreaks provides a way to control this.
+% 
+\newif\ifallowcodebreaks  \allowcodebreakstrue
+
+\def\keywordtrue{true}
+\def\keywordfalse{false}
+
+\parseargdef\allowcodebreaks{%
+  \def\txiarg{#1}%
+  \ifx\txiarg\keywordtrue
+    \allowcodebreakstrue
+  \else\ifx\txiarg\keywordfalse
+    \allowcodebreaksfalse
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @allowcodebreaks option `\txiarg'}%
+  \fi\fi
+}
+
 % @kbd is like @code, except that if the argument is just one @key command,
 % then @kbd has no effect.
 
 % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
 %   `example' (@kbd uses ttsl only inside of @example and friends),
 %   or `code' (@kbd uses normal tty font always).
-\def\kbdinputstyle{\parsearg\kbdinputstylexxx}
-\def\kbdinputstylexxx#1{%
-  \def\arg{#1}%
-  \ifx\arg\worddistinct
+\parseargdef\kbdinputstyle{%
+  \def\txiarg{#1}%
+  \ifx\txiarg\worddistinct
     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
-  \else\ifx\arg\wordexample
+  \else\ifx\txiarg\wordexample
     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
-  \else\ifx\arg\wordcode
+  \else\ifx\txiarg\wordcode
     \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
   \else
     \errhelp = \EMsimple
-    \errmessage{Unknown @kbdinputstyle option `\arg'}%
+    \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
   \fi\fi\fi
 }
 \def\worddistinct{distinct}
@@ -1633,8 +2449,8 @@ where each line of input produces a line of output.}
 \else{\tclose{\kbdfont\look}}\fi
 \else{\tclose{\kbdfont\look}}\fi}
 
-% For @url, @env, @command quotes seem unnecessary, so use \code.
-\let\url=\code
+% For @indicateurl, @env, @command quotes seem unnecessary, so use \code.
+\let\indicateurl=\code
 \let\env=\code
 \let\command=\code
 
@@ -1666,6 +2482,10 @@ where each line of input produces a line of output.}
   \endlink
 \endgroup}
 
+% @url synonym for @uref, since that's how everyone uses it.
+%
+\let\url=\uref
+
 % rms does not like angle brackets --karl, 17may97.
 % So now @email is just like @uref, unless we are pdf.
 %
@@ -1707,22 +2527,105 @@ where each line of input produces a line of output.}
 \def\sc#1{{\smallcaps#1}}       % smallcaps font
 \def\ii#1{{\it #1}}             % italic font
 
-% @acronym downcases the argument and prints in smallcaps.
-\def\acronym#1{{\smallcaps \lowercase{#1}}}
+% @acronym for "FBI", "NATO", and the like.
+% We print this one point size smaller, since it's intended for
+% all-uppercase.
+% 
+\def\acronym#1{\doacronym #1,,\finish}
+\def\doacronym#1,#2,#3\finish{%
+  {\selectfonts\lsize #1}%
+  \def\temp{#2}%
+  \ifx\temp\empty \else
+    \space ({\unsepspaces \ignorespaces \temp \unskip})%
+  \fi
+}
+
+% @abbr for "Comput. J." and the like.
+% No font change, but don't do end-of-sentence spacing.
+% 
+\def\abbr#1{\doabbr #1,,\finish}
+\def\doabbr#1,#2,#3\finish{%
+  {\plainfrenchspacing #1}%
+  \def\temp{#2}%
+  \ifx\temp\empty \else
+    \space ({\unsepspaces \ignorespaces \temp \unskip})%
+  \fi
+}
 
-% @pounds{} is a sterling sign.
+% @pounds{} is a sterling sign, which Knuth put in the CM italic font.
+%
 \def\pounds{{\it\$}}
 
-% @registeredsymbol - R in a circle.  For now, only works in text size;
-% we'd have to redo the font mechanism to change the \scriptstyle and
-% \scriptscriptstyle font sizes to make it look right in headings.
+% @euro{} comes from a separate font, depending on the current style.
+% We use the free feym* fonts from the eurosym package by Henrik
+% Theiling, which support regular, slanted, bold and bold slanted (and
+% "outlined" (blackboard board, sort of) versions, which we don't need).
+% It is available from http://www.ctan.org/tex-archive/fonts/eurosym.
+% 
+% Although only regular is the truly official Euro symbol, we ignore
+% that.  The Euro is designed to be slightly taller than the regular
+% font height.
+% 
+% feymr - regular
+% feymo - slanted
+% feybr - bold
+% feybo - bold slanted
+% 
+% There is no good (free) typewriter version, to my knowledge.
+% A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide.
+% Hmm.
+% 
+% Also doesn't work in math.  Do we need to do math with euro symbols?
+% Hope not.
+% 
+% 
+\def\euro{{\eurofont e}}
+\def\eurofont{%
+  % We set the font at each command, rather than predefining it in
+  % \textfonts and the other font-switching commands, so that
+  % installations which never need the symbol don't have to have the
+  % font installed.
+  % 
+  % There is only one designed size (nominal 10pt), so we always scale
+  % that to the current nominal size.
+  % 
+  % By the way, simply using "at 1em" works for cmr10 and the like, but
+  % does not work for cmbx10 and other extended/shrunken fonts.
+  % 
+  \def\eurosize{\csname\curfontsize nominalsize\endcsname}%
+  %
+  \ifx\curfontstyle\bfstylename 
+    % bold:
+    \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize
+  \else 
+    % regular:
+    \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize
+  \fi
+  \thiseurofont
+}
+
+% @registeredsymbol - R in a circle.  The font for the R should really
+% be smaller yet, but lllsize is the best we can do for now.
 % Adapted from the plain.tex definition of \copyright.
 %
 \def\registeredsymbol{%
-  $^{{\ooalign{\hfil\raise.07ex\hbox{$\scriptstyle\rm R$}\hfil\crcr\Orb}}%
+  $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}%
+               \hfil\crcr\Orb}}%
     }$%
 }
 
+% @textdegree - the normal degrees sign.
+%
+\def\textdegree{$^\circ$}
+
+% Laurent Siebenmann reports \Orb undefined with:
+%  Textures 1.7.7 (preloaded format=plain 93.10.14)  (68K)  16 APR 2004 02:38
+% so we'll define it if necessary.
+% 
+\ifx\Orb\undefined
+\def\Orb{\mathhexbox20D}
+\fi
+
 
 \message{page headings,}
 
@@ -1741,87 +2644,103 @@ where each line of input produces a line of output.}
 \newif\ifsetshortcontentsaftertitlepage
  \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue
 
-\def\shorttitlepage{\parsearg\shorttitlepagezzz}
-\def\shorttitlepagezzz #1{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
+\parseargdef\shorttitlepage{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
         \endgroup\page\hbox{}\page}
 
-\def\titlepage{\begingroup \parindent=0pt \textfonts
-   \let\subtitlerm=\tenrm
-   \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}%
-   %
-   \def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines
-                   \let\tt=\authortt}%
-   %
-   % Leave some space at the very top of the page.
-   \vglue\titlepagetopglue
-   %
-   % Now you can print the title using @title.
-   \def\title{\parsearg\titlezzz}%
-   \def\titlezzz##1{\leftline{\titlefonts\rm ##1}
-                    % print a rule at the page bottom also.
-                    \finishedtitlepagefalse
-                    \vskip4pt \hrule height 4pt width \hsize \vskip4pt}%
-   % No rule at page bottom unless we print one at the top with @title.
-   \finishedtitlepagetrue
-   %
-   % Now you can put text using @subtitle.
-   \def\subtitle{\parsearg\subtitlezzz}%
-   \def\subtitlezzz##1{{\subtitlefont \rightline{##1}}}%
-   %
-   % @author should come last, but may come many times.
-   \def\author{\parsearg\authorzzz}%
-   \def\authorzzz##1{\ifseenauthor\else\vskip 0pt plus 1filll\seenauthortrue\fi
-      {\authorfont \leftline{##1}}}%
-   %
-   % Most title ``pages'' are actually two pages long, with space
-   % at the top of the second.  We don't want the ragged left on the second.
-   \let\oldpage = \page
-   \def\page{%
+\envdef\titlepage{%
+  % Open one extra group, as we want to close it in the middle of \Etitlepage.
+  \begingroup
+    \parindent=0pt \textfonts
+    % Leave some space at the very top of the page.
+    \vglue\titlepagetopglue
+    % No rule at page bottom unless we print one at the top with @title.
+    \finishedtitlepagetrue
+    %
+    % Most title ``pages'' are actually two pages long, with space
+    % at the top of the second.  We don't want the ragged left on the second.
+    \let\oldpage = \page
+    \def\page{%
       \iffinishedtitlepage\else
-         \finishtitlepage
+	 \finishtitlepage
       \fi
-      \oldpage
       \let\page = \oldpage
-      \hbox{}}%
-%   \def\page{\oldpage \hbox{}}
+      \page
+      \null
+    }%
 }
 
 \def\Etitlepage{%
-   \iffinishedtitlepage\else
-      \finishtitlepage
-   \fi
-   % It is important to do the page break before ending the group,
-   % because the headline and footline are only empty inside the group.
-   % If we use the new definition of \page, we always get a blank page
-   % after the title page, which we certainly don't want.
-   \oldpage
-   \endgroup
-   %
-   % Need this before the \...aftertitlepage checks so that if they are
-   % in effect the toc pages will come out with page numbers.
-   \HEADINGSon
-   %
-   % If they want short, they certainly want long too.
-   \ifsetshortcontentsaftertitlepage
-     \shortcontents
-     \contents
-     \global\let\shortcontents = \relax
-     \global\let\contents = \relax
-   \fi
-   %
-   \ifsetcontentsaftertitlepage
-     \contents
-     \global\let\contents = \relax
-     \global\let\shortcontents = \relax
-   \fi
+    \iffinishedtitlepage\else
+	\finishtitlepage
+    \fi
+    % It is important to do the page break before ending the group,
+    % because the headline and footline are only empty inside the group.
+    % If we use the new definition of \page, we always get a blank page
+    % after the title page, which we certainly don't want.
+    \oldpage
+  \endgroup
+  %
+  % Need this before the \...aftertitlepage checks so that if they are
+  % in effect the toc pages will come out with page numbers.
+  \HEADINGSon
+  %
+  % If they want short, they certainly want long too.
+  \ifsetshortcontentsaftertitlepage
+    \shortcontents
+    \contents
+    \global\let\shortcontents = \relax
+    \global\let\contents = \relax
+  \fi
+  %
+  \ifsetcontentsaftertitlepage
+    \contents
+    \global\let\contents = \relax
+    \global\let\shortcontents = \relax
+  \fi
 }
 
 \def\finishtitlepage{%
-   \vskip4pt \hrule height 2pt width \hsize
-   \vskip\titlepagebottomglue
-   \finishedtitlepagetrue
+  \vskip4pt \hrule height 2pt width \hsize
+  \vskip\titlepagebottomglue
+  \finishedtitlepagetrue
 }
 
+%%% Macros to be used within @titlepage:
+
+\let\subtitlerm=\tenrm
+\def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}
+
+\def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines
+		\let\tt=\authortt}
+
+\parseargdef\title{%
+  \checkenv\titlepage
+  \leftline{\titlefonts\rm #1}
+  % print a rule at the page bottom also.
+  \finishedtitlepagefalse
+  \vskip4pt \hrule height 4pt width \hsize \vskip4pt
+}
+
+\parseargdef\subtitle{%
+  \checkenv\titlepage
+  {\subtitlefont \rightline{#1}}%
+}
+
+% @author should come last, but may come many times.
+% It can also be used inside @quotation.
+%
+\parseargdef\author{%
+  \def\temp{\quotation}%
+  \ifx\thisenv\temp
+    \def\quotationauthor{#1}% printed in \Equotation.
+  \else
+    \checkenv\titlepage
+    \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi
+    {\authorfont \leftline{#1}}%
+  \fi
+}
+
+
 %%% Set up page headings and footings.
 
 \let\thispage=\folio
@@ -1831,7 +2750,7 @@ where each line of input produces a line of output.}
 \newtoks\evenfootline    % footline on even pages
 \newtoks\oddfootline     % footline on odd pages
 
-% Now make Tex use those variables
+% Now make TeX use those variables
 \headline={{\textfonts\rm \ifodd\pageno \the\oddheadline
                             \else \the\evenheadline \fi}}
 \footline={{\textfonts\rm \ifodd\pageno \the\oddfootline
@@ -1845,43 +2764,37 @@ where each line of input produces a line of output.}
 % @evenfooting @thisfile||
 % @oddfooting ||@thisfile
 
-\def\evenheading{\parsearg\evenheadingxxx}
-\def\oddheading{\parsearg\oddheadingxxx}
-\def\everyheading{\parsearg\everyheadingxxx}
-
-\def\evenfooting{\parsearg\evenfootingxxx}
-\def\oddfooting{\parsearg\oddfootingxxx}
-\def\everyfooting{\parsearg\everyfootingxxx}
-
-{\catcode`\@=0 %
 
-\gdef\evenheadingxxx #1{\evenheadingyyy #1@|@|@|@|\finish}
-\gdef\evenheadingyyy #1@|#2@|#3@|#4\finish{%
+\def\evenheading{\parsearg\evenheadingxxx}
+\def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish}
+\def\evenheadingyyy #1\|#2\|#3\|#4\finish{%
 \global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
 
-\gdef\oddheadingxxx #1{\oddheadingyyy #1@|@|@|@|\finish}
-\gdef\oddheadingyyy #1@|#2@|#3@|#4\finish{%
+\def\oddheading{\parsearg\oddheadingxxx}
+\def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish}
+\def\oddheadingyyy #1\|#2\|#3\|#4\finish{%
 \global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
 
-\gdef\everyheadingxxx#1{\oddheadingxxx{#1}\evenheadingxxx{#1}}%
+\parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}%
 
-\gdef\evenfootingxxx #1{\evenfootingyyy #1@|@|@|@|\finish}
-\gdef\evenfootingyyy #1@|#2@|#3@|#4\finish{%
+\def\evenfooting{\parsearg\evenfootingxxx}
+\def\evenfootingxxx #1{\evenfootingyyy #1\|\|\|\|\finish}
+\def\evenfootingyyy #1\|#2\|#3\|#4\finish{%
 \global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
 
-\gdef\oddfootingxxx #1{\oddfootingyyy #1@|@|@|@|\finish}
-\gdef\oddfootingyyy #1@|#2@|#3@|#4\finish{%
+\def\oddfooting{\parsearg\oddfootingxxx}
+\def\oddfootingxxx #1{\oddfootingyyy #1\|\|\|\|\finish}
+\def\oddfootingyyy #1\|#2\|#3\|#4\finish{%
   \global\oddfootline = {\rlap{\centerline{#2}}\line{#1\hfil#3}}%
   %
   % Leave some space for the footline.  Hopefully ok to assume
   % @evenfooting will not be used by itself.
-  \global\advance\pageheight by -\baselineskip
-  \global\advance\vsize by -\baselineskip
+  \global\advance\pageheight by -12pt
+  \global\advance\vsize by -12pt
 }
 
-\gdef\everyfootingxxx#1{\oddfootingxxx{#1}\evenfootingxxx{#1}}
-%
-}% unbind the catcode of @.
+\parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
+
 
 % @headings double      turns headings on for double-sided printing.
 % @headings single      turns headings on for single-sided printing.
@@ -1895,7 +2808,7 @@ where each line of input produces a line of output.}
 
 \def\headings #1 {\csname HEADINGS#1\endcsname}
 
-\def\HEADINGSoff{
+\def\HEADINGSoff{%
 \global\evenheadline={\hfil} \global\evenfootline={\hfil}
 \global\oddheadline={\hfil} \global\oddfootline={\hfil}}
 \HEADINGSoff
@@ -1904,7 +2817,7 @@ where each line of input produces a line of output.}
 % chapter name on inside top of right hand pages, document
 % title on inside top of left hand pages, and page numbers on outside top
 % edge of all pages.
-\def\HEADINGSdouble{
+\def\HEADINGSdouble{%
 \global\pageno=1
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
@@ -1916,7 +2829,7 @@ where each line of input produces a line of output.}
 
 % For single-sided printing, chapter title goes across top left of page,
 % page number on top right.
-\def\HEADINGSsingle{
+\def\HEADINGSsingle{%
 \global\pageno=1
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
@@ -1963,12 +2876,11 @@ where each line of input produces a line of output.}
 % @settitle line...  specifies the title of the document, for headings.
 % It generates no output of its own.
 \def\thistitle{\putwordNoTitle}
-\def\settitle{\parsearg\settitlezzz}
-\def\settitlezzz #1{\gdef\thistitle{#1}}
+\def\settitle{\parsearg{\gdef\thistitle}}
 
 
 \message{tables,}
-% Tables -- @table, @ftable, @vtable, @item(x), @kitem(x), @xitem(x).
+% Tables -- @table, @ftable, @vtable, @item(x).
 
 % default indentation of table text
 \newdimen\tableindent \tableindent=.8in
@@ -1980,7 +2892,7 @@ where each line of input produces a line of output.}
 % used internally for \itemindent minus \itemmargin
 \newdimen\itemmax
 
-% Note @table, @vtable, and @vtable define @item, @itemx, etc., with
+% Note @table, @ftable, and @vtable define @item, @itemx, etc., with
 % these defs.
 % They also define \itemindex
 % to index the item name in whatever manner is desired (perhaps none).
@@ -1992,22 +2904,10 @@ where each line of input produces a line of output.}
 \def\internalBitem{\smallbreak \parsearg\itemzzz}
 \def\internalBitemx{\itemxpar \parsearg\itemzzz}
 
-\def\internalBxitem "#1"{\def\xitemsubtopix{#1} \smallbreak \parsearg\xitemzzz}
-\def\internalBxitemx "#1"{\def\xitemsubtopix{#1} \itemxpar \parsearg\xitemzzz}
-
-\def\internalBkitem{\smallbreak \parsearg\kitemzzz}
-\def\internalBkitemx{\itemxpar \parsearg\kitemzzz}
-
-\def\kitemzzz #1{\dosubind {kw}{\code{#1}}{for {\bf \lastfunction}}%
-                 \itemzzz {#1}}
-
-\def\xitemzzz #1{\dosubind {kw}{\code{#1}}{for {\bf \xitemsubtopic}}%
-                 \itemzzz {#1}}
-
 \def\itemzzz #1{\begingroup %
   \advance\hsize by -\rightskip
   \advance\hsize by -\tableindent
-  \setbox0=\hbox{\itemfont{#1}}%
+  \setbox0=\hbox{\itemindicate{#1}}%
   \itemindex{#1}%
   \nobreak % This prevents a break before @itemx.
   %
@@ -2031,17 +2931,13 @@ where each line of input produces a line of output.}
     % \parskip glue -- logically it's part of the @item we just started.
     \nobreak \vskip-\parskip
     %
-    % Stop a page break at the \parskip glue coming up.  (Unfortunately
-    % we can't prevent a possible page break at the following
-    % \baselineskip glue.)  However, if what follows is an environment
-    % such as @example, there will be no \parskip glue; then
-    % the negative vskip we just would cause the example and the item to
-    % crash together.  So we use this bizarre value of 10001 as a signal
-    % to \aboveenvbreak to insert \parskip glue after all.
-    % (Possibly there are other commands that could be followed by
-    % @example which need the same treatment, but not section titles; or
-    % maybe section titles are the only special case and they should be
-    % penalty 10001...)
+    % Stop a page break at the \parskip glue coming up.  However, if
+    % what follows is an environment such as @example, there will be no
+    % \parskip glue; then the negative vskip we just inserted would
+    % cause the example and the item to crash together.  So we use this
+    % bizarre value of 10001 as a signal to \aboveenvbreak to insert
+    % \parskip glue after all.  Section titles are handled this way also.
+    % 
     \penalty 10001
     \endgroup
     \itemxneedsnegativevskipfalse
@@ -2061,81 +2957,72 @@ where each line of input produces a line of output.}
   \fi
 }
 
-\def\item{\errmessage{@item while not in a table}}
-\def\itemx{\errmessage{@itemx while not in a table}}
-\def\kitem{\errmessage{@kitem while not in a table}}
-\def\kitemx{\errmessage{@kitemx while not in a table}}
-\def\xitem{\errmessage{@xitem while not in a table}}
-\def\xitemx{\errmessage{@xitemx while not in a table}}
-
-% Contains a kludge to get @end[description] to work.
-\def\description{\tablez{\dontindex}{1}{}{}{}{}}
+\def\item{\errmessage{@item while not in a list environment}}
+\def\itemx{\errmessage{@itemx while not in a list environment}}
 
 % @table, @ftable, @vtable.
-\def\table{\begingroup\inENV\obeylines\obeyspaces\tablex}
-{\obeylines\obeyspaces%
-\gdef\tablex #1^^M{%
-\tabley\dontindex#1        \endtabley}}
-
-\def\ftable{\begingroup\inENV\obeylines\obeyspaces\ftablex}
-{\obeylines\obeyspaces%
-\gdef\ftablex #1^^M{%
-\tabley\fnitemindex#1        \endtabley
-\def\Eftable{\endgraf\afterenvbreak\endgroup}%
-\let\Etable=\relax}}
-
-\def\vtable{\begingroup\inENV\obeylines\obeyspaces\vtablex}
-{\obeylines\obeyspaces%
-\gdef\vtablex #1^^M{%
-\tabley\vritemindex#1        \endtabley
-\def\Evtable{\endgraf\afterenvbreak\endgroup}%
-\let\Etable=\relax}}
-
-\def\dontindex #1{}
-\def\fnitemindex #1{\doind {fn}{\code{#1}}}%
-\def\vritemindex #1{\doind {vr}{\code{#1}}}%
-
-{\obeyspaces %
-\gdef\tabley#1#2 #3 #4 #5 #6 #7\endtabley{\endgroup%
-\tablez{#1}{#2}{#3}{#4}{#5}{#6}}}
-
-\def\tablez #1#2#3#4#5#6{%
-\aboveenvbreak %
-\begingroup %
-\def\Edescription{\Etable}% Necessary kludge.
-\let\itemindex=#1%
-\ifnum 0#3>0 \advance \leftskip by #3\mil \fi %
-\ifnum 0#4>0 \tableindent=#4\mil \fi %
-\ifnum 0#5>0 \advance \rightskip by #5\mil \fi %
-\def\itemfont{#2}%
-\itemmax=\tableindent %
-\advance \itemmax by -\itemmargin %
-\advance \leftskip by \tableindent %
-\exdentamount=\tableindent
-\parindent = 0pt
-\parskip = \smallskipamount
-\ifdim \parskip=0pt \parskip=2pt \fi%
-\def\Etable{\endgraf\afterenvbreak\endgroup}%
-\let\item = \internalBitem %
-\let\itemx = \internalBitemx %
-\let\kitem = \internalBkitem %
-\let\kitemx = \internalBkitemx %
-\let\xitem = \internalBxitem %
-\let\xitemx = \internalBxitemx %
+\envdef\table{%
+  \let\itemindex\gobble
+  \tablecheck{table}%
+}
+\envdef\ftable{%
+  \def\itemindex ##1{\doind {fn}{\code{##1}}}%
+  \tablecheck{ftable}%
+}
+\envdef\vtable{%
+  \def\itemindex ##1{\doind {vr}{\code{##1}}}%
+  \tablecheck{vtable}%
+}
+\def\tablecheck#1{%
+  \ifnum \the\catcode`\^^M=\active
+    \endgroup
+    \errmessage{This command won't work in this context; perhaps the problem is
+      that we are \inenvironment\thisenv}%
+    \def\next{\doignore{#1}}%
+  \else
+    \let\next\tablex
+  \fi
+  \next
+}
+\def\tablex#1{%
+  \def\itemindicate{#1}%
+  \parsearg\tabley
+}
+\def\tabley#1{%
+  {%
+    \makevalueexpandable
+    \edef\temp{\noexpand\tablez #1\space\space\space}%
+    \expandafter
+  }\temp \endtablez
 }
+\def\tablez #1 #2 #3 #4\endtablez{%
+  \aboveenvbreak
+  \ifnum 0#1>0 \advance \leftskip by #1\mil \fi
+  \ifnum 0#2>0 \tableindent=#2\mil \fi
+  \ifnum 0#3>0 \advance \rightskip by #3\mil \fi
+  \itemmax=\tableindent
+  \advance \itemmax by -\itemmargin
+  \advance \leftskip by \tableindent
+  \exdentamount=\tableindent
+  \parindent = 0pt
+  \parskip = \smallskipamount
+  \ifdim \parskip=0pt \parskip=2pt \fi
+  \let\item = \internalBitem
+  \let\itemx = \internalBitemx
+}
+\def\Etable{\endgraf\afterenvbreak}
+\let\Eftable\Etable
+\let\Evtable\Etable
+\let\Eitemize\Etable
+\let\Eenumerate\Etable
 
 % This is the counter used by @enumerate, which is really @itemize
 
 \newcount \itemno
 
-\def\itemize{\parsearg\itemizezzz}
-
-\def\itemizezzz #1{%
-  \begingroup % ended by the @end itemize
-  \itemizey {#1}{\Eitemize}
-}
+\envdef\itemize{\parsearg\doitemize}
 
-\def\itemizey#1#2{%
+\def\doitemize#1{%
   \aboveenvbreak
   \itemmax=\itemindent
   \advance\itemmax by -\itemmargin
@@ -2144,13 +3031,33 @@ where each line of input produces a line of output.}
   \parindent=0pt
   \parskip=\smallskipamount
   \ifdim\parskip=0pt \parskip=2pt \fi
-  \def#2{\endgraf\afterenvbreak\endgroup}%
   \def\itemcontents{#1}%
   % @itemize with no arg is equivalent to @itemize @bullet.
   \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi
   \let\item=\itemizeitem
 }
 
+% Definition of @item while inside @itemize and @enumerate.
+%
+\def\itemizeitem{%
+  \advance\itemno by 1  % for enumerations
+  {\let\par=\endgraf \smallbreak}% reasonable place to break
+  {%
+   % If the document has an @itemize directly after a section title, a
+   % \nobreak will be last on the list, and \sectionheading will have
+   % done a \vskip-\parskip.  In that case, we don't want to zero
+   % parskip, or the item text will crash with the heading.  On the
+   % other hand, when there is normal text preceding the item (as there
+   % usually is), we do want to zero parskip, or there would be too much
+   % space.  In that case, we won't have a \nobreak before.  At least
+   % that's the theory.
+   \ifnum\lastpenalty<10000 \parskip=0in \fi
+   \noindent
+   \hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
+   \vadjust{\penalty 1200}}% not good to break after first line of item.
+  \flushcr
+}
+
 % \splitoff TOKENS\endmark defines \first to be the first token in
 % TOKENS, and \rest to be the remainder.
 %
@@ -2160,11 +3067,8 @@ where each line of input produces a line of output.}
 % or number, to specify the first label in the enumerated list.  No
 % argument is the same as `1'.
 %
-\def\enumerate{\parsearg\enumeratezzz}
-\def\enumeratezzz #1{\enumeratey #1  \endenumeratey}
+\envparseargdef\enumerate{\enumeratey #1  \endenumeratey}
 \def\enumeratey #1 #2\endenumeratey{%
-  \begingroup % ended by the @end enumerate
-  %
   % If we were given no argument, pretend we were given `1'.
   \def\thearg{#1}%
   \ifx\thearg\empty \def\thearg{1}\fi
@@ -2235,13 +3139,13 @@ where each line of input produces a line of output.}
   }%
 }
 
-% Call itemizey, adding a period to the first argument and supplying the
+% Call \doitemize, adding a period to the first argument and supplying the
 % common last two arguments.  Also subtract one from the initial value in
 % \itemno, since @item increments \itemno.
 %
 \def\startenumeration#1{%
   \advance\itemno by -1
-  \itemizey{#1.}\Eenumerate\flushcr
+  \doitemize{#1.}\flushcr
 }
 
 % @alphaenumerate and @capsenumerate are abbreviations for giving an arg
@@ -2252,16 +3156,6 @@ where each line of input produces a line of output.}
 \def\Ealphaenumerate{\Eenumerate}
 \def\Ecapsenumerate{\Eenumerate}
 
-% Definition of @item while inside @itemize.
-
-\def\itemizeitem{%
-\advance\itemno by 1
-{\let\par=\endgraf \smallbreak}%
-\ifhmode \errmessage{In hmode at itemizeitem}\fi
-{\parskip=0in \hskip 0pt
-\hbox to 0pt{\hss \itemcontents\hskip \itemmargin}%
-\vadjust{\penalty 1200}}%
-\flushcr}
 
 % @multitable macros
 % Amy Hendrickson, 8/18/94, 3/6/96
@@ -2288,24 +3182,14 @@ where each line of input produces a line of output.}
 %   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
 %   @item ...
 %   using the widest term desired in each column.
-%
-% For those who want to use more than one line's worth of words in
-% the preamble, break the line within one argument and it
-% will parse correctly, i.e.,
-%
-%     @multitable {Column 1 template} {Column 2 template} {Column 3
-%      template}
-% Not:
-%     @multitable {Column 1 template} {Column 2 template}
-%      {Column 3 template}
 
 % Each new table line starts with @item, each subsequent new column
 % starts with @tab. Empty columns may be produced by supplying @tab's
 % with nothing between them for as many times as empty columns are needed,
 % ie, @tab@tab@tab will produce two empty columns.
 
-% @item, @tab, @multitable or @end multitable do not need to be on their
-% own lines, but it will not hurt if they are.
+% @item, @tab do not need to be on their own lines, but it will not hurt
+% if they are.
 
 % Sample multitable:
 
@@ -2349,13 +3233,12 @@ where each line of input produces a line of output.}
 \def\xcolumnfractions{\columnfractions}
 \newif\ifsetpercent
 
-% #1 is the part of the @columnfraction before the decimal point, which
-% is presumably either 0 or the empty string (but we don't check, we
-% just throw it away).  #2 is the decimal part, which we use as the
-% percent of \hsize for this column.
-\def\pickupwholefraction#1.#2 {%
+% #1 is the @columnfraction, usually a decimal number like .5, but might
+% be just 1.  We just use it, whatever it is.
+%
+\def\pickupwholefraction#1 {%
   \global\advance\colcount by 1
-  \expandafter\xdef\csname col\the\colcount\endcsname{.#2\hsize}%
+  \expandafter\xdef\csname col\the\colcount\endcsname{#1\hsize}%
   \setuptable
 }
 
@@ -2388,18 +3271,33 @@ where each line of input produces a line of output.}
   \go
 }
 
+% multitable-only commands.
+%
+% @headitem starts a heading row, which we typeset in bold.
+% Assignments have to be global since we are inside the implicit group
+% of an alignment entry.  Note that \everycr resets \everytab.
+\def\headitem{\checkenv\multitable \crcr \global\everytab={\bf}\the\everytab}%
+%
+% A \tab used to include \hskip1sp.  But then the space in a template
+% line is not enough.  That is bad.  So let's go back to just `&' until
+% we encounter the problem it was intended to solve again.
+%					--karl, [email protected], 20apr99.
+\def\tab{\checkenv\multitable &\the\everytab}%
+
 % @multitable ... @end multitable definitions:
 %
-\def\multitable{\parsearg\dotable}
-\def\dotable#1{\bgroup
+\newtoks\everytab  % insert after every tab.
+%
+\envdef\multitable{%
   \vskip\parskip
-  \let\item=\crcrwithfootnotes
-  % A \tab used to include \hskip1sp.  But then the space in a template
-  % line is not enough.  That is bad.  So let's go back to just & until
-  % we encounter the problem it was intended to solve again.  --karl,
-  % [email protected], 20apr99.
-  \let\tab=&%
-  \let\startfootins=\startsavedfootnote
+  \startsavinginserts
+  %
+  % @item within a multitable starts a normal row.
+  % We use \def instead of \let so that if one of the multitable entries
+  % contains an @itemize, we don't choke on the \item (seen as \crcr aka
+  % \endtemplate) expanding \doitemize.
+  \def\item{\crcr}%
+  %
   \tolerance=9500
   \hbadness=9500
   \setmultitablespacing
@@ -2407,85 +3305,93 @@ where each line of input produces a line of output.}
   \parindent=\multitableparindent
   \overfullrule=0pt
   \global\colcount=0
-  \def\Emultitable{%
-    \global\setpercentfalse
-    \crcrwithfootnotes\crcr
-    \egroup\egroup
+  %
+  \everycr = {%
+    \noalign{%
+      \global\everytab={}%
+      \global\colcount=0 % Reset the column counter.
+      % Check for saved footnotes, etc.
+      \checkinserts
+      % Keeps underfull box messages off when table breaks over pages.
+      %\filbreak
+	% Maybe so, but it also creates really weird page breaks when the
+	% table breaks over pages. Wouldn't \vfil be better?  Wait until the
+	% problem manifests itself, so it can be fixed for real --karl.
+    }%
   }%
   %
+  \parsearg\domultitable
+}
+\def\domultitable#1{%
   % To parse everything between @multitable and @item:
   \setuptable#1 \endsetuptable
   %
-  % \everycr will reset column counter, \colcount, at the end of
-  % each line. Every column entry will cause \colcount to advance by one.
-  % The table preamble
-  % looks at the current \colcount to find the correct column width.
-  \everycr{\noalign{%
-  %
-  % \filbreak%% keeps underfull box messages off when table breaks over pages.
-  % Maybe so, but it also creates really weird page breaks when the table
-  % breaks over pages. Wouldn't \vfil be better?  Wait until the problem
-  % manifests itself, so it can be fixed for real --karl.
-    \global\colcount=0\relax}}%
-  %
   % This preamble sets up a generic column definition, which will
   % be used as many times as user calls for columns.
   % \vtop will set a single line and will also let text wrap and
   % continue for many paragraphs if desired.
-  \halign\bgroup&\global\advance\colcount by 1\relax
-    \multistrut\vtop{\hsize=\expandafter\csname col\the\colcount\endcsname
-  %
-  % In order to keep entries from bumping into each other
-  % we will add a \leftskip of \multitablecolspace to all columns after
-  % the first one.
-  %
-  % If a template has been used, we will add \multitablecolspace
-  % to the width of each template entry.
-  %
-  % If the user has set preamble in terms of percent of \hsize we will
-  % use that dimension as the width of the column, and the \leftskip
-  % will keep entries from bumping into each other.  Table will start at
-  % left margin and final column will justify at right margin.
-  %
-  % Make sure we don't inherit \rightskip from the outer environment.
-  \rightskip=0pt
-  \ifnum\colcount=1
-    % The first column will be indented with the surrounding text.
-    \advance\hsize by\leftskip
-  \else
-    \ifsetpercent \else
-      % If user has not set preamble in terms of percent of \hsize
-      % we will advance \hsize by \multitablecolspace.
-      \advance\hsize by \multitablecolspace
-    \fi
-   % In either case we will make \leftskip=\multitablecolspace:
-  \leftskip=\multitablecolspace
-  \fi
-  % Ignoring space at the beginning and end avoids an occasional spurious
-  % blank line, when TeX decides to break the line at the space before the
-  % box from the multistrut, so the strut ends up on a line by itself.
-  % For example:
-  % @multitable @columnfractions .11 .89
-  % @item @code{#}
-  % @tab Legal holiday which is valid in major parts of the whole country.
-  % Is automatically provided with highlighting sequences respectively marking
-  % characters.
-  \noindent\ignorespaces##\unskip\multistrut}\cr
-}
-
-\def\setmultitablespacing{% test to see if user has set \multitablelinespace.
-% If so, do nothing. If not, give it an appropriate dimension based on
-% current baselineskip.
+  \halign\bgroup &%
+    \global\advance\colcount by 1
+    \multistrut
+    \vtop{%
+      % Use the current \colcount to find the correct column width:
+      \hsize=\expandafter\csname col\the\colcount\endcsname
+      %
+      % In order to keep entries from bumping into each other
+      % we will add a \leftskip of \multitablecolspace to all columns after
+      % the first one.
+      %
+      % If a template has been used, we will add \multitablecolspace
+      % to the width of each template entry.
+      %
+      % If the user has set preamble in terms of percent of \hsize we will
+      % use that dimension as the width of the column, and the \leftskip
+      % will keep entries from bumping into each other.  Table will start at
+      % left margin and final column will justify at right margin.
+      %
+      % Make sure we don't inherit \rightskip from the outer environment.
+      \rightskip=0pt
+      \ifnum\colcount=1
+	% The first column will be indented with the surrounding text.
+	\advance\hsize by\leftskip
+      \else
+	\ifsetpercent \else
+	  % If user has not set preamble in terms of percent of \hsize
+	  % we will advance \hsize by \multitablecolspace.
+	  \advance\hsize by \multitablecolspace
+	\fi
+       % In either case we will make \leftskip=\multitablecolspace:
+      \leftskip=\multitablecolspace
+      \fi
+      % Ignoring space at the beginning and end avoids an occasional spurious
+      % blank line, when TeX decides to break the line at the space before the
+      % box from the multistrut, so the strut ends up on a line by itself.
+      % For example:
+      % @multitable @columnfractions .11 .89
+      % @item @code{#}
+      % @tab Legal holiday which is valid in major parts of the whole country.
+      % Is automatically provided with highlighting sequences respectively
+      % marking characters.
+      \noindent\ignorespaces##\unskip\multistrut
+    }\cr
+}
+\def\Emultitable{%
+  \crcr
+  \egroup % end the \halign
+  \global\setpercentfalse
+}
+
+\def\setmultitablespacing{%
+  \def\multistrut{\strut}% just use the standard line spacing
+  %
+  % Compute \multitablelinespace (if not defined by user) for use in
+  % \multitableparskip calculation.  We used define \multistrut based on
+  % this, but (ironically) that caused the spacing to be off.
+  % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100.
 \ifdim\multitablelinespace=0pt
 \setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
 \global\advance\multitablelinespace by-\ht0
-%% strut to put in table in case some entry doesn't have descenders,
-%% to keep lines equally spaced
-\let\multistrut = \strut
-\else
-%% FIXME: what is \box0 supposed to be?
-\gdef\multistrut{\vrule height\multitablelinespace depth\dp0
-width0pt\relax} \fi
+\fi
 %% Test to see if parskip is larger than space between lines of
 %% table. If not, do nothing.
 %%        If so, set to same dimension as multitablelinespace.
@@ -2500,163 +3406,33 @@ width0pt\relax} \fi
                                       %% than skip between lines in the table.
 \fi}
 
-% In case a @footnote appears inside an alignment, save the footnote
-% text to a box and make the \insert when a row of the table is
-% finished.  Otherwise, the insertion is lost, it never migrates to the
-% main vertical list.  --kasal, 22jan03.
-%
-\newbox\savedfootnotes
-%
-% \dotable \let's \startfootins to this, so that \dofootnote will call
-% it instead of starting the insertion right away.
-\def\startsavedfootnote{%
-  \global\setbox\savedfootnotes = \vbox\bgroup
-    \unvbox\savedfootnotes
-}
-\def\crcrwithfootnotes{%
-  \crcr
-  \ifvoid\savedfootnotes \else
-    \noalign{\insert\footins{\box\savedfootnotes}}%
-  \fi
-}
 
 \message{conditionals,}
-% Prevent errors for section commands.
-% Used in @ignore and in failing conditionals.
-\def\ignoresections{%
-  \let\chapter=\relax
-  \let\unnumbered=\relax
-  \let\top=\relax
-  \let\unnumberedsec=\relax
-  \let\unnumberedsection=\relax
-  \let\unnumberedsubsec=\relax
-  \let\unnumberedsubsection=\relax
-  \let\unnumberedsubsubsec=\relax
-  \let\unnumberedsubsubsection=\relax
-  \let\section=\relax
-  \let\subsec=\relax
-  \let\subsubsec=\relax
-  \let\subsection=\relax
-  \let\subsubsection=\relax
-  \let\appendix=\relax
-  \let\appendixsec=\relax
-  \let\appendixsection=\relax
-  \let\appendixsubsec=\relax
-  \let\appendixsubsection=\relax
-  \let\appendixsubsubsec=\relax
-  \let\appendixsubsubsection=\relax
-  \let\contents=\relax
-  \let\smallbook=\relax
-  \let\titlepage=\relax
-}
-
-% Used in nested conditionals, where we have to parse the Texinfo source
-% and so want to turn off most commands, in case they are used
-% incorrectly.
-%
-% We use \empty instead of \relax for the @def... commands, so that \end
-% doesn't throw an error.  For instance:
-% @ignore
-% @deffn ...
-% @end deffn
-% @end ignore
-%
-% The @end deffn is going to get expanded, because we're trying to allow
-% nested conditionals.  But we don't want to expand the actual @deffn,
-% since it might be syntactically correct and intended to be ignored.
-% Since \end checks for \relax, using \empty does not cause an error.
-%
-\def\ignoremorecommands{%
-  \let\defcodeindex = \relax
-  \let\defcv = \empty
-  \let\defcvx = \empty
-  \let\Edefcv = \empty
-  \let\deffn = \empty
-  \let\deffnx = \empty
-  \let\Edeffn = \empty
-  \let\defindex = \relax
-  \let\defivar = \empty
-  \let\defivarx = \empty
-  \let\Edefivar = \empty
-  \let\defmac = \empty
-  \let\defmacx = \empty
-  \let\Edefmac = \empty
-  \let\defmethod = \empty
-  \let\defmethodx = \empty
-  \let\Edefmethod = \empty
-  \let\defop = \empty
-  \let\defopx = \empty
-  \let\Edefop = \empty
-  \let\defopt = \empty
-  \let\defoptx = \empty
-  \let\Edefopt = \empty
-  \let\defspec = \empty
-  \let\defspecx = \empty
-  \let\Edefspec = \empty
-  \let\deftp = \empty
-  \let\deftpx = \empty
-  \let\Edeftp = \empty
-  \let\deftypefn = \empty
-  \let\deftypefnx = \empty
-  \let\Edeftypefn = \empty
-  \let\deftypefun = \empty
-  \let\deftypefunx = \empty
-  \let\Edeftypefun = \empty
-  \let\deftypeivar = \empty
-  \let\deftypeivarx = \empty
-  \let\Edeftypeivar = \empty
-  \let\deftypemethod = \empty
-  \let\deftypemethodx = \empty
-  \let\Edeftypemethod = \empty
-  \let\deftypeop = \empty
-  \let\deftypeopx = \empty
-  \let\Edeftypeop = \empty
-  \let\deftypevar = \empty
-  \let\deftypevarx = \empty
-  \let\Edeftypevar = \empty
-  \let\deftypevr = \empty
-  \let\deftypevrx = \empty
-  \let\Edeftypevr = \empty
-  \let\defun = \empty
-  \let\defunx = \empty
-  \let\Edefun = \empty
-  \let\defvar = \empty
-  \let\defvarx = \empty
-  \let\Edefvar = \empty
-  \let\defvr = \empty
-  \let\defvrx = \empty
-  \let\Edefvr = \empty
-  \let\clear = \relax
-  \let\down = \relax
-  \let\evenfooting = \relax
-  \let\evenheading = \relax
-  \let\everyfooting = \relax
-  \let\everyheading = \relax
-  \let\headings = \relax
-  \let\include = \relax
-  \let\item = \relax
-  \let\lowersections = \relax
-  \let\oddfooting = \relax
-  \let\oddheading = \relax
-  \let\printindex = \relax
-  \let\pxref = \relax
-  \let\raisesections = \relax
-  \let\ref = \relax
-  \let\set = \relax
-  \let\setchapternewpage = \relax
-  \let\setchapterstyle = \relax
-  \let\settitle = \relax
-  \let\up = \relax
-  \let\verbatiminclude = \relax
-  \let\xref = \relax
+
+% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext,
+% @ifnotxml always succeed.  They currently do nothing; we don't
+% attempt to check whether the conditionals are properly nested.  But we
+% have to remember that they are conditionals, so that @end doesn't
+% attempt to close an environment group.
+%
+\def\makecond#1{%
+  \expandafter\let\csname #1\endcsname = \relax
+  \expandafter\let\csname iscond.#1\endcsname = 1
 }
+\makecond{iftex}
+\makecond{ifnotdocbook}
+\makecond{ifnothtml}
+\makecond{ifnotinfo}
+\makecond{ifnotplaintext}
+\makecond{ifnotxml}
 
 % Ignore @ignore, @ifhtml, @ifinfo, and the like.
 %
 \def\direntry{\doignore{direntry}}
-\def\documentdescriptionword{documentdescription}
 \def\documentdescription{\doignore{documentdescription}}
+\def\docbook{\doignore{docbook}}
 \def\html{\doignore{html}}
+\def\ifdocbook{\doignore{ifdocbook}}
 \def\ifhtml{\doignore{ifhtml}}
 \def\ifinfo{\doignore{ifinfo}}
 \def\ifnottex{\doignore{ifnottex}}
@@ -2666,198 +3442,139 @@ width0pt\relax} \fi
 \def\menu{\doignore{menu}}
 \def\xml{\doignore{xml}}
 
-% @dircategory CATEGORY  -- specify a category of the dir file
-% which this file should belong to.  Ignore this in TeX.
-\let\dircategory = \comment
-
-% Ignore text until a line `@end #1'.
+% Ignore text until a line `@end #1', keeping track of nested conditionals.
 %
+% A count to remember the depth of nesting.
+\newcount\doignorecount
+
 \def\doignore#1{\begingroup
-  % Don't complain about control sequences we have declared \outer.
-  \ignoresections
-  %
-  % Define a command to swallow text until we reach `@end #1'.
-  % This @ is a catcode 12 token (that is the normal catcode of @ in
-  % this texinfo.tex file).  We change the catcode of @ below to match.
-  \long\def\doignoretext##1@end #1{\enddoignore}%
+  % Scan in ``verbatim'' mode:
+  \obeylines
+  \catcode`\@ = \other
+  \catcode`\{ = \other
+  \catcode`\} = \other
   %
   % Make sure that spaces turn into tokens that match what \doignoretext wants.
-  \catcode\spaceChar = 10
-  %
-  % Ignore braces, too, so mismatched braces don't cause trouble.
-  \catcode`\{ = 9
-  \catcode`\} = 9
+  \spaceisspace
   %
-  % We must not have @c interpreted as a control sequence.
-  \catcode`\@ = 12
+  % Count number of #1's that we've seen.
+  \doignorecount = 0
   %
-  \def\ignoreword{#1}%
-  \ifx\ignoreword\documentdescriptionword
-    % The c kludge breaks documentdescription, since
-    % `documentdescription' contains a `c'.  Means not everything will
-    % be ignored inside @documentdescription, but oh well...
-  \else
-    % Make the letter c a comment character so that the rest of the line
-    % will be ignored. This way, the document can have (for example)
-    %   @c @end ifinfo
-    % and the @end ifinfo will be properly ignored.
-    % (We've just changed @ to catcode 12.)
-    \catcode`\c = 14
-  \fi
-  %
-  % And now expand the command defined above.
-  \doignoretext
-}
-
-% What we do to finish off ignored text.
-%
-\def\enddoignore{\endgroup\ignorespaces}%
-
-\newif\ifwarnedobs\warnedobsfalse
-\def\obstexwarn{%
-  \ifwarnedobs\relax\else
-  % We need to warn folks that they may have trouble with TeX 3.0.
-  % This uses \immediate\write16 rather than \message to get newlines.
-    \immediate\write16{}
-    \immediate\write16{WARNING: for users of Unix TeX 3.0!}
-    \immediate\write16{This manual trips a bug in TeX version 3.0 (tex hangs).}
-    \immediate\write16{If you are running another version of TeX, relax.}
-    \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.}
-    \immediate\write16{  Then upgrade your TeX installation if you can.}
-    \immediate\write16{  (See ftp://ftp.gnu.org/non-gnu/TeX.README.)}
-    \immediate\write16{If you are stuck with version 3.0, run the}
-    \immediate\write16{  script ``tex3patch'' from the Texinfo distribution}
-    \immediate\write16{  to use a workaround.}
-    \immediate\write16{}
-    \global\warnedobstrue
-    \fi
+  % Swallow text until we reach the matching `@end #1'.
+  \dodoignore{#1}%
 }
 
-% **In TeX 3.0, setting text in \nullfont hangs tex.  For a
-% workaround (which requires the file ``dummy.tfm'' to be installed),
-% uncomment the following line:
-%%%%%\font\nullfont=dummy\let\obstexwarn=\relax
-
-% Ignore text, except that we keep track of conditional commands for
-% purposes of nesting, up to an `@end #1' command.
-%
-\def\nestedignore#1{%
-  \obstexwarn
-  % We must actually expand the ignored text to look for the @end
-  % command, so that nested ignore constructs work.  Thus, we put the
-  % text into a \vbox and then do nothing with the result.  To minimize
-  % the chance of memory overflow, we follow the approach outlined on
-  % page 401 of the TeXbook.
+{ \catcode`_=11 % We want to use \_STOP_ which cannot appear in texinfo source.
+  \obeylines %
   %
-  \setbox0 = \vbox\bgroup
-    % Don't complain about control sequences we have declared \outer.
-    \ignoresections
-    %
-    % Define `@end #1' to end the box, which will in turn undefine the
-    % @end command again.
-    \expandafter\def\csname E#1\endcsname{\egroup\ignorespaces}%
-    %
-    % We are going to be parsing Texinfo commands.  Most cause no
-    % trouble when they are used incorrectly, but some commands do
-    % complicated argument parsing or otherwise get confused, so we
-    % undefine them.
-    %
-    % We can't do anything about stray @-signs, unfortunately;
-    % they'll produce `undefined control sequence' errors.
-    \ignoremorecommands
-    %
-    % Set the current font to be \nullfont, a TeX primitive, and define
-    % all the font commands to also use \nullfont.  We don't use
-    % dummy.tfm, as suggested in the TeXbook, because some sites
-    % might not have that installed.  Therefore, math mode will still
-    % produce output, but that should be an extremely small amount of
-    % stuff compared to the main input.
-    %
-    \nullfont
-    \let\tenrm=\nullfont \let\tenit=\nullfont \let\tensl=\nullfont
-    \let\tenbf=\nullfont \let\tentt=\nullfont \let\smallcaps=\nullfont
-    \let\tensf=\nullfont
-    % Similarly for index fonts.
-    \let\smallrm=\nullfont \let\smallit=\nullfont \let\smallsl=\nullfont
-    \let\smallbf=\nullfont \let\smalltt=\nullfont \let\smallsc=\nullfont
-    \let\smallsf=\nullfont
-    % Similarly for smallexample fonts.
-    \let\smallerrm=\nullfont \let\smallerit=\nullfont \let\smallersl=\nullfont
-    \let\smallerbf=\nullfont \let\smallertt=\nullfont \let\smallersc=\nullfont
-    \let\smallersf=\nullfont
+  \gdef\dodoignore#1{%
+    % #1 contains the command name as a string, e.g., `ifinfo'.
     %
-    % Don't complain when characters are missing from the fonts.
-    \tracinglostchars = 0
+    % Define a command to find the next `@end #1'.
+    \long\def\doignoretext##1^^M@end #1{%
+      \doignoretextyyy##1^^M@#1\_STOP_}%
     %
-    % Don't bother to do space factor calculations.
-    \frenchspacing
+    % And this command to find another #1 command, at the beginning of a
+    % line.  (Otherwise, we would consider a line `@c @ifset', for
+    % example, to count as an @ifset for nesting.)
+    \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}%
     %
-    % Don't report underfull hboxes.
-    \hbadness = 10000
-    %
-    % Do minimal line-breaking.
-    \pretolerance = 10000
-    %
-    % Do not execute instructions in @tex.
-    \def\tex{\doignore{tex}}%
-    % Do not execute macro definitions.
-    % `c' is a comment character, so the word `macro' will get cut off.
-    \def\macro{\doignore{ma}}%
+    % And now expand that command.
+    \doignoretext ^^M%
+  }%
+}
+
+\def\doignoreyyy#1{%
+  \def\temp{#1}%
+  \ifx\temp\empty			% Nothing found.
+    \let\next\doignoretextzzz
+  \else					% Found a nested condition, ...
+    \advance\doignorecount by 1
+    \let\next\doignoretextyyy		% ..., look for another.
+    % If we're here, #1 ends with ^^M\ifinfo (for example).
+  \fi
+  \next #1% the token \_STOP_ is present just after this macro.
 }
 
+% We have to swallow the remaining "\_STOP_".
+%
+\def\doignoretextzzz#1{%
+  \ifnum\doignorecount = 0	% We have just found the outermost @end.
+    \let\next\enddoignore
+  \else				% Still inside a nested condition.
+    \advance\doignorecount by -1
+    \let\next\doignoretext      % Look for the next @end.
+  \fi
+  \next
+}
+
+% Finish off ignored text.
+{ \obeylines%
+  % Ignore anything after the last `@end #1'; this matters in verbatim
+  % environments, where otherwise the newline after an ignored conditional
+  % would result in a blank line in the output.
+  \gdef\enddoignore#1^^M{\endgroup\ignorespaces}%
+}
+
+
 % @set VAR sets the variable VAR to an empty value.
 % @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE.
 %
 % Since we want to separate VAR from REST-OF-LINE (which might be
 % empty), we can't just use \parsearg; we have to insert a space of our
 % own to delimit the rest of the line, and then take it out again if we
-% didn't need it.  Make sure the catcode of space is correct to avoid
-% losing inside @example, for instance.
+% didn't need it.
+% We rely on the fact that \parsearg sets \catcode`\ =10.
 %
-\def\set{\begingroup\catcode` =10
-  \catcode`\-=12 \catcode`\_=12 % Allow - and _ in VAR.
-  \parsearg\setxxx}
-\def\setxxx#1{\setyyy#1 \endsetyyy}
+\parseargdef\set{\setyyy#1 \endsetyyy}
 \def\setyyy#1 #2\endsetyyy{%
-  \def\temp{#2}%
-  \ifx\temp\empty \global\expandafter\let\csname SET#1\endcsname = \empty
-  \else \setzzz{#1}#2\endsetzzz % Remove the trailing space \setxxx inserted.
-  \fi
-  \endgroup
+  {%
+    \makevalueexpandable
+    \def\temp{#2}%
+    \edef\next{\gdef\makecsname{SET#1}}%
+    \ifx\temp\empty
+      \next{}%
+    \else
+      \setzzz#2\endsetzzz
+    \fi
+  }%
 }
-% Can't use \xdef to pre-expand #2 and save some time, since \temp or
-% \next or other control sequences that we've defined might get us into
-% an infinite loop. Consider `@set foo @cite{bar}'.
-\def\setzzz#1#2 \endsetzzz{\expandafter\gdef\csname SET#1\endcsname{#2}}
+% Remove the trailing space \setxxx inserted.
+\def\setzzz#1 \endsetzzz{\next{#1}}
 
 % @clear VAR clears (i.e., unsets) the variable VAR.
 %
-\def\clear{\parsearg\clearxxx}
-\def\clearxxx#1{\global\expandafter\let\csname SET#1\endcsname=\relax}
+\parseargdef\clear{%
+  {%
+    \makevalueexpandable
+    \global\expandafter\let\csname SET#1\endcsname=\relax
+  }%
+}
 
 % @value{foo} gets the text saved in variable foo.
+\def\value{\begingroup\makevalueexpandable\valuexxx}
+\def\valuexxx#1{\expandablevalue{#1}\endgroup}
 {
-  \catcode`\_ = \active
+  \catcode`\- = \active \catcode`\_ = \active
   %
-  % We might end up with active _ or - characters in the argument if
-  % we're called from @code, as @code{@value{foo-bar_}}.  So \let any
-  % such active characters to their normal equivalents.
-  \gdef\value{\begingroup
+  \gdef\makevalueexpandable{%
+    \let\value = \expandablevalue
+    % We don't want these characters active, ...
     \catcode`\-=\other \catcode`\_=\other
-    \indexbreaks \let_\normalunderscore
-    \valuexxx}
+    % ..., but we might end up with active ones in the argument if
+    % we're called from @code, as @code{@value{foo-bar_}}, though.
+    % So \let them to their normal equivalents.
+    \let-\realdash \let_\normalunderscore
+  }
 }
-\def\valuexxx#1{\expandablevalue{#1}\endgroup}
 
 % We have this subroutine so that we can handle at least some @value's
-% properly in indexes (we \let\value to this in \indexdummies).  Ones
-% whose names contain - or _ still won't work, but we can't do anything
-% about that.  The command has to be fully expandable (if the variable
-% is set), since the result winds up in the index file.  This means that
-% if the variable's value contains other Texinfo commands, it's almost
-% certain it will fail (although perhaps we could fix that with
-% sufficient work to do a one-level expansion on the result, instead of
-% complete).
+% properly in indexes (we call \makevalueexpandable in \indexdummies).
+% The command has to be fully expandable (if the variable is set), since
+% the result winds up in the index file.  This means that if the
+% variable's value contains other Texinfo commands, it's almost certain
+% it will fail (although perhaps we could fix that with sufficient work
+% to do a one-level expansion on the result, instead of complete).
 %
 \def\expandablevalue#1{%
   \expandafter\ifx\csname SET#1\endcsname\relax
@@ -2871,55 +3588,36 @@ width0pt\relax} \fi
 % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
 % with @set.
 %
-\def\ifset{\parsearg\doifset}
-\def\doifset#1{%
-  \expandafter\ifx\csname SET#1\endcsname\relax
-    \let\next=\ifsetfail
-  \else
-    \let\next=\ifsetsucceed
-  \fi
-  \next
+% To get special treatment of `@end ifset,' call \makeond and the redefine.
+%
+\makecond{ifset}
+\def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}}
+\def\doifset#1#2{%
+  {%
+    \makevalueexpandable
+    \let\next=\empty
+    \expandafter\ifx\csname SET#2\endcsname\relax
+      #1% If not set, redefine \next.
+    \fi
+    \expandafter
+  }\next
 }
-\def\ifsetsucceed{\conditionalsucceed{ifset}}
-\def\ifsetfail{\nestedignore{ifset}}
-\defineunmatchedend{ifset}
+\def\ifsetfail{\doignore{ifset}}
 
 % @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
 % defined with @set, or has been undefined with @clear.
 %
-\def\ifclear{\parsearg\doifclear}
-\def\doifclear#1{%
-  \expandafter\ifx\csname SET#1\endcsname\relax
-    \let\next=\ifclearsucceed
-  \else
-    \let\next=\ifclearfail
-  \fi
-  \next
-}
-\def\ifclearsucceed{\conditionalsucceed{ifclear}}
-\def\ifclearfail{\nestedignore{ifclear}}
-\defineunmatchedend{ifclear}
-
-% @iftex, @ifnothtml, @ifnotinfo, @ifnotplaintext always succeed; we
-% read the text following, through the first @end iftex (etc.).  Make
-% `@end iftex' (etc.) valid only after an @iftex.
+% The `\else' inside the `\doifset' parameter is a trick to reuse the
+% above code: if the variable is not set, do nothing, if it is set,
+% then redefine \next to \ifclearfail.
 %
-\def\iftex{\conditionalsucceed{iftex}}
-\def\ifnothtml{\conditionalsucceed{ifnothtml}}
-\def\ifnotinfo{\conditionalsucceed{ifnotinfo}}
-\def\ifnotplaintext{\conditionalsucceed{ifnotplaintext}}
-\defineunmatchedend{iftex}
-\defineunmatchedend{ifnothtml}
-\defineunmatchedend{ifnotinfo}
-\defineunmatchedend{ifnotplaintext}
+\makecond{ifclear}
+\def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}}
+\def\ifclearfail{\doignore{ifclear}}
 
-% True conditional.  Since \set globally defines its variables, we can
-% just start and end a group (to keep the @end definition undefined at
-% the outer level).
-%
-\def\conditionalsucceed#1{\begingroup
-  \expandafter\def\csname E#1\endcsname{\endgroup}%
-}
+% @dircategory CATEGORY  -- specify a category of the dir file
+% which this file should belong to.  Ignore this in TeX.
+\let\dircategory=\comment
 
 % @defininfoenclose.
 \let\definfoenclose=\comment
@@ -2929,9 +3627,8 @@ width0pt\relax} \fi
 % Index generation facilities
 
 % Define \newwrite to be identical to plain tex's \newwrite
-% except not \outer, so it can be used within \newindex.
-{\catcode`\@=11
-\gdef\newwrite{\alloc@7\write\chardef\sixt@@n}}
+% except not \outer, so it can be used within macros and \if's.
+\edef\newwrite{\makecsname{ptexnewwrite}}
 
 % \newindex {foo} defines an index named foo.
 % It automatically defines \fooindex such that
@@ -3017,41 +3714,50 @@ width0pt\relax} \fi
 % we have to laboriously prevent expansion for those that we don't.
 %
 \def\indexdummies{%
+  \escapechar = `\\     % use backslash in output files.
   \def\@{@}% change to @@ when we switch to @ as escape char in index files.
   \def\ {\realbackslash\space }%
+  %
   % Need these in case \tex is in effect and \{ is a \delimiter again.
   % But can't use \lbracecmd and \rbracecmd because texindex assumes
   % braces and backslashes are used only as delimiters.
   \let\{ = \mylbrace
   \let\} = \myrbrace
   %
-  % \definedummyword defines \#1 as \realbackslash #1\space, thus
-  % effectively preventing its expansion.  This is used only for control
-  % words, not control letters, because the \space would be incorrect
-  % for control characters, but is needed to separate the control word
-  % from whatever follows.
-  %
-  % For control letters, we have \definedummyletter, which omits the
-  % space.
-  %
-  % These can be used both for control words that take an argument and
-  % those that do not.  If it is followed by {arg} in the input, then
-  % that will dutifully get written to the index (or wherever).
-  %
-  \def\definedummyword##1{%
-    \expandafter\def\csname ##1\endcsname{\realbackslash ##1\space}%
-  }%
-  \def\definedummyletter##1{%
-    \expandafter\def\csname ##1\endcsname{\realbackslash ##1}%
-  }%
+  % I don't entirely understand this, but when an index entry is
+  % generated from a macro call, the \endinput which \scanmacro inserts
+  % causes processing to be prematurely terminated.  This is,
+  % apparently, because \indexsorttmp is fully expanded, and \endinput
+  % is an expandable command.  The redefinition below makes \endinput
+  % disappear altogether for that purpose -- although logging shows that
+  % processing continues to some further point.  On the other hand, it
+  % seems \endinput does not hurt in the printed index arg, since that
+  % is still getting written without apparent harm.
+  % 
+  % Sample source (mac-idx3.tex, reported by Graham Percival to
+  % help-texinfo, 22may06):
+  % @macro funindex {WORD}
+  % @findex xyz
+  % @end macro
+  % ...
+  % @funindex commtest
+  % 
+  % The above is not enough to reproduce the bug, but it gives the flavor.
+  % 
+  % Sample whatsit resulting:
+  % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}}
+  % 
+  % So:
+  \let\endinput = \empty
   %
   % Do the redefinitions.
   \commondummies
 }
 
-% For the aux file, @ is the escape character.  So we want to redefine
-% everything using @ instead of \realbackslash.  When everything uses
-% @, this will be simpler.
+% For the aux and toc files, @ is the escape character.  So we want to
+% redefine everything using @ as the escape character (instead of
+% \realbackslash, still used for index files).  When everything uses @,
+% this will be simpler.
 %
 \def\atdummies{%
   \def\@{@@}%
@@ -3059,160 +3765,180 @@ width0pt\relax} \fi
   \let\{ = \lbraceatcmd
   \let\} = \rbraceatcmd
   %
-  % (See comments in \indexdummies.)
-  \def\definedummyword##1{%
-    \expandafter\def\csname ##1\endcsname{@##1\space}%
-  }%
-  \def\definedummyletter##1{%
-    \expandafter\def\csname ##1\endcsname{@##1}%
-  }%
-  %
   % Do the redefinitions.
   \commondummies
+  \otherbackslash
 }
 
-% Called from \indexdummies and \atdummies.  \definedummyword and
-% \definedummyletter must be defined first.
+% Called from \indexdummies and \atdummies.
 %
 \def\commondummies{%
   %
-  \normalturnoffactive
+  % \definedummyword defines \#1 as \string\#1\space, thus effectively
+  % preventing its expansion.  This is used only for control% words,
+  % not control letters, because the \space would be incorrect for
+  % control characters, but is needed to separate the control word
+  % from whatever follows.
   %
-  % Control letters and accents.
-  \definedummyletter{_}%
-  \definedummyletter{,}%
-  \definedummyletter{"}%
-  \definedummyletter{`}%
-  \definedummyletter{'}%
-  \definedummyletter{^}%
-  \definedummyletter{~}%
-  \definedummyletter{=}%
-  \definedummyword{u}%
-  \definedummyword{v}%
-  \definedummyword{H}%
-  \definedummyword{dotaccent}%
-  \definedummyword{ringaccent}%
-  \definedummyword{tieaccent}%
-  \definedummyword{ubaraccent}%
-  \definedummyword{udotaccent}%
-  \definedummyword{dotless}%
-  %
-  % Other non-English letters.
-  \definedummyword{AA}%
-  \definedummyword{AE}%
-  \definedummyword{L}%
-  \definedummyword{OE}%
-  \definedummyword{O}%
-  \definedummyword{aa}%
-  \definedummyword{ae}%
-  \definedummyword{l}%
-  \definedummyword{oe}%
-  \definedummyword{o}%
-  \definedummyword{ss}%
+  % For control letters, we have \definedummyletter, which omits the
+  % space.
   %
-  % Although these internal commands shouldn't show up, sometimes they do.
-  \definedummyword{bf}%
-  \definedummyword{gtr}%
-  \definedummyword{hat}%
-  \definedummyword{less}%
-  \definedummyword{sf}%
-  \definedummyword{sl}%
-  \definedummyword{tclose}%
-  \definedummyword{tt}%
+  % These can be used both for control words that take an argument and
+  % those that do not.  If it is followed by {arg} in the input, then
+  % that will dutifully get written to the index (or wherever).
   %
-  % Texinfo font commands.
-  \definedummyword{b}%
-  \definedummyword{i}%
-  \definedummyword{r}%
-  \definedummyword{sc}%
-  \definedummyword{t}%
-  %
-  \definedummyword{TeX}%
-  \definedummyword{acronym}%
-  \definedummyword{cite}%
-  \definedummyword{code}%
-  \definedummyword{command}%
-  \definedummyword{dfn}%
-  \definedummyword{dots}%
-  \definedummyword{emph}%
-  \definedummyword{env}%
-  \definedummyword{file}%
-  \definedummyword{kbd}%
-  \definedummyword{key}%
-  \definedummyword{math}%
-  \definedummyword{option}%
-  \definedummyword{samp}%
-  \definedummyword{strong}%
-  \definedummyword{uref}%
-  \definedummyword{url}%
-  \definedummyword{var}%
-  \definedummyword{w}%
+  \def\definedummyword  ##1{\def##1{\string##1\space}}%
+  \def\definedummyletter##1{\def##1{\string##1}}%
+  \let\definedummyaccent\definedummyletter
+  %
+  \commondummiesnofonts
+  %
+  \definedummyletter\_%
+  %
+  % Non-English letters.
+  \definedummyword\AA
+  \definedummyword\AE
+  \definedummyword\L
+  \definedummyword\OE
+  \definedummyword\O
+  \definedummyword\aa
+  \definedummyword\ae
+  \definedummyword\l
+  \definedummyword\oe
+  \definedummyword\o
+  \definedummyword\ss
+  \definedummyword\exclamdown
+  \definedummyword\questiondown
+  \definedummyword\ordf
+  \definedummyword\ordm
+  %
+  % Although these internal commands shouldn't show up, sometimes they do.
+  \definedummyword\bf
+  \definedummyword\gtr
+  \definedummyword\hat
+  \definedummyword\less
+  \definedummyword\sf
+  \definedummyword\sl
+  \definedummyword\tclose
+  \definedummyword\tt
+  %
+  \definedummyword\LaTeX
+  \definedummyword\TeX
   %
   % Assorted special characters.
-  \definedummyword{bullet}%
-  \definedummyword{copyright}%
-  \definedummyword{dots}%
-  \definedummyword{enddots}%
-  \definedummyword{equiv}%
-  \definedummyword{error}%
-  \definedummyword{expansion}%
-  \definedummyword{minus}%
-  \definedummyword{pounds}%
-  \definedummyword{point}%
-  \definedummyword{print}%
-  \definedummyword{result}%
-  %
-  % Handle some cases of @value -- where the variable name does not
-  % contain - or _, and the value does not contain any
-  % (non-fully-expandable) commands.
-  \let\value = \expandablevalue
+  \definedummyword\bullet
+  \definedummyword\comma
+  \definedummyword\copyright
+  \definedummyword\registeredsymbol
+  \definedummyword\dots
+  \definedummyword\enddots
+  \definedummyword\equiv
+  \definedummyword\error
+  \definedummyword\euro
+  \definedummyword\expansion
+  \definedummyword\minus
+  \definedummyword\pounds
+  \definedummyword\point
+  \definedummyword\print
+  \definedummyword\result
+  \definedummyword\textdegree
+  %
+  % We want to disable all macros so that they are not expanded by \write.
+  \macrolist
   %
-  % Normal spaces, not active ones.
-  \unsepspaces
+  \normalturnoffactive
   %
-  % No macro expansion.
-  \turnoffmacros
+  % Handle some cases of @value -- where it does not contain any
+  % (non-fully-expandable) commands.
+  \makevalueexpandable
 }
 
-% If an index command is used in an @example environment, any spaces
-% therein should become regular spaces in the raw index file, not the
-% expansion of \tie (\leavevmode \penalty \@M \ ).
-{\obeyspaces
- \gdef\unsepspaces{\obeyspaces\let =\space}}
-
+% \commondummiesnofonts: common to \commondummies and \indexnofonts.
+%
+\def\commondummiesnofonts{%
+  % Control letters and accents.
+  \definedummyletter\!%
+  \definedummyaccent\"%
+  \definedummyaccent\'%
+  \definedummyletter\*%
+  \definedummyaccent\,%
+  \definedummyletter\.%
+  \definedummyletter\/%
+  \definedummyletter\:%
+  \definedummyaccent\=%
+  \definedummyletter\?%
+  \definedummyaccent\^%
+  \definedummyaccent\`%
+  \definedummyaccent\~%
+  \definedummyword\u
+  \definedummyword\v
+  \definedummyword\H
+  \definedummyword\dotaccent
+  \definedummyword\ringaccent
+  \definedummyword\tieaccent
+  \definedummyword\ubaraccent
+  \definedummyword\udotaccent
+  \definedummyword\dotless
+  %
+  % Texinfo font commands.
+  \definedummyword\b
+  \definedummyword\i
+  \definedummyword\r
+  \definedummyword\sc
+  \definedummyword\t
+  %
+  % Commands that take arguments.
+  \definedummyword\acronym
+  \definedummyword\cite
+  \definedummyword\code
+  \definedummyword\command
+  \definedummyword\dfn
+  \definedummyword\emph
+  \definedummyword\env
+  \definedummyword\file
+  \definedummyword\kbd
+  \definedummyword\key
+  \definedummyword\math
+  \definedummyword\option
+  \definedummyword\pxref
+  \definedummyword\ref
+  \definedummyword\samp
+  \definedummyword\strong
+  \definedummyword\tie
+  \definedummyword\uref
+  \definedummyword\url
+  \definedummyword\var
+  \definedummyword\verb
+  \definedummyword\w
+  \definedummyword\xref
+}
 
 % \indexnofonts is used when outputting the strings to sort the index
 % by, and when constructing control sequence names.  It eliminates all
 % control sequences and just writes whatever the best ASCII sort string
 % would be for a given command (usually its argument).
 %
-\def\indexdummytex{TeX}
-\def\indexdummydots{...}
-%
 \def\indexnofonts{%
+  % Accent commands should become @asis.
+  \def\definedummyaccent##1{\let##1\asis}%
+  % We can just ignore other control letters.
+  \def\definedummyletter##1{\let##1\empty}%
+  % Hopefully, all control words can become @asis.
+  \let\definedummyword\definedummyaccent
+  %
+  \commondummiesnofonts
+  %
+  % Don't no-op \tt, since it isn't a user-level command
+  % and is used in the definitions of the active chars like <, >, |, etc.
+  % Likewise with the other plain tex font commands.
+  %\let\tt=\asis
+  %
   \def\ { }%
   \def\@{@}%
   % how to handle braces?
   \def\_{\normalunderscore}%
   %
-  \let\,=\asis
-  \let\"=\asis
-  \let\`=\asis
-  \let\'=\asis
-  \let\^=\asis
-  \let\~=\asis
-  \let\==\asis
-  \let\u=\asis
-  \let\v=\asis
-  \let\H=\asis
-  \let\dotaccent=\asis
-  \let\ringaccent=\asis
-  \let\tieaccent=\asis
-  \let\ubaraccent=\asis
-  \let\udotaccent=\asis
-  \let\dotless=\asis
-  %
-  % Other non-English letters.
+  % Non-English letters.
   \def\AA{AA}%
   \def\AE{AE}%
   \def\L{L}%
@@ -3226,130 +3952,182 @@ width0pt\relax} \fi
   \def\ss{ss}%
   \def\exclamdown{!}%
   \def\questiondown{?}%
+  \def\ordf{a}%
+  \def\ordm{o}%
   %
-  % Don't no-op \tt, since it isn't a user-level command
-  % and is used in the definitions of the active chars like <, >, |, etc.
-  % Likewise with the other plain tex font commands.
-  %\let\tt=\asis
+  \def\LaTeX{LaTeX}%
+  \def\TeX{TeX}%
   %
-  % Texinfo font commands.
-  \let\b=\asis
-  \let\i=\asis
-  \let\r=\asis
-  \let\sc=\asis
-  \let\t=\asis
-  %
-  \let\TeX=\indexdummytex
-  \let\acronym=\asis
-  \let\cite=\asis
-  \let\code=\asis
-  \let\command=\asis
-  \let\dfn=\asis
-  \let\dots=\indexdummydots
-  \let\emph=\asis
-  \let\env=\asis
-  \let\file=\asis
-  \let\kbd=\asis
-  \let\key=\asis
-  \let\math=\asis
-  \let\option=\asis
-  \let\samp=\asis
-  \let\strong=\asis
-  \let\uref=\asis
-  \let\url=\asis
-  \let\var=\asis
-  \let\w=\asis
+  % Assorted special characters.
+  % (The following {} will end up in the sort string, but that's ok.)
+  \def\bullet{bullet}%
+  \def\comma{,}%
+  \def\copyright{copyright}%
+  \def\registeredsymbol{R}%
+  \def\dots{...}%
+  \def\enddots{...}%
+  \def\equiv{==}%
+  \def\error{error}%
+  \def\euro{euro}%
+  \def\expansion{==>}%
+  \def\minus{-}%
+  \def\pounds{pounds}%
+  \def\point{.}%
+  \def\print{-|}%
+  \def\result{=>}%
+  \def\textdegree{degrees}%
+  %
+  % We need to get rid of all macros, leaving only the arguments (if present).
+  % Of course this is not nearly correct, but it is the best we can do for now.
+  % makeinfo does not expand macros in the argument to @deffn, which ends up
+  % writing an index entry, and texindex isn't prepared for an index sort entry
+  % that starts with \.
+  % 
+  % Since macro invocations are followed by braces, we can just redefine them
+  % to take a single TeX argument.  The case of a macro invocation that
+  % goes to end-of-line is not handled.
+  % 
+  \macrolist
 }
 
 \let\indexbackslash=0  %overridden during \printindex.
 \let\SETmarginindex=\relax % put index entries in margin (undocumented)?
 
-% For \ifx comparisons.
-\def\emptymacro{\empty}
-
 % Most index entries go through here, but \dosubind is the general case.
-%
-\def\doind#1#2{\dosubind{#1}{#2}\empty}
+% #1 is the index name, #2 is the entry text.
+\def\doind#1#2{\dosubind{#1}{#2}{}}
 
 % Workhorse for all \fooindexes.
 % #1 is name of index, #2 is stuff to put there, #3 is subentry --
-% \empty if called from \doind, as we usually are.  The main exception
-% is with defuns, which call us directly.
+% empty if called from \doind, as we usually are (the main exception
+% is with most defuns, which call us directly).
 %
 \def\dosubind#1#2#3{%
+  \iflinks
+  {%
+    % Store the main index entry text (including the third arg).
+    \toks0 = {#2}%
+    % If third arg is present, precede it with a space.
+    \def\thirdarg{#3}%
+    \ifx\thirdarg\empty \else
+      \toks0 = \expandafter{\the\toks0 \space #3}%
+    \fi
+    %
+    \edef\writeto{\csname#1indfile\endcsname}%
+    %
+    \safewhatsit\dosubindwrite
+  }%
+  \fi
+}
+
+% Write the entry in \toks0 to the index file:
+%
+\def\dosubindwrite{%
   % Put the index entry in the margin if desired.
   \ifx\SETmarginindex\relax\else
-    \insert\margin{\hbox{\vrule height8pt depth3pt width0pt #2}}%
+    \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}%
   \fi
-  {%
-    \count255=\lastpenalty
-    {%
-      \indexdummies % Must do this here, since \bf, etc expand at this stage
-      \escapechar=`\\
-      {%
-        \let\folio = 0% We will expand all macros now EXCEPT \folio.
-        \def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now
-        % so it will be output as is; and it will print as backslash.
-        %
-        % The main index entry text.
-        \toks0 = {#2}%
-        %
-        % If third arg is present, precede it with space in sort key.
-        \def\thirdarg{#3}%
-        \ifx\thirdarg\emptymacro \else
-           % If the third (subentry) arg is present, add it to the index
-           % line to write.
-          \toks0 = \expandafter{\the\toks0 \space #3}%
-        \fi
-        %
-        % Process the index entry with all font commands turned off, to
-        % get the string to sort by.
-        {\indexnofonts
-         \edef\temp{\the\toks0}% need full expansion
-         \xdef\indexsorttmp{\temp}%
-        }%
-        %
-        % Set up the complete index entry, with both the sort key and
-        % the original text, including any font commands.  We write
-        % three arguments to \entry to the .?? file (four in the
-        % subentry case), texindex reduces to two when writing the .??s
-        % sorted result.
-        \edef\temp{%
-          \write\csname#1indfile\endcsname{%
-            \realbackslash entry{\indexsorttmp}{\folio}{\the\toks0}}%
-        }%
-        %
-        % If a skip is the last thing on the list now, preserve it
-        % by backing up by \lastskip, doing the \write, then inserting
-        % the skip again.  Otherwise, the whatsit generated by the
-        % \write will make \lastskip zero.  The result is that sequences
-        % like this:
-        % @end defun
-        % @tindex whatever
-        % @defun ...
-        % will have extra space inserted, because the \medbreak in the
-        % start of the @defun won't see the skip inserted by the @end of
-        % the previous defun.
-        %
-        % But don't do any of this if we're not in vertical mode.  We
-        % don't want to do a \vskip and prematurely end a paragraph.
-        %
-        % Avoid page breaks due to these extra skips, too.
-        %
-        \iflinks
-          \ifvmode
-            \skip0 = \lastskip
-            \ifdim\lastskip = 0pt \else \nobreak\vskip-\skip0 \fi
-          \fi
-          %
-          \temp % do the write
-          %
-          \ifvmode \ifdim\skip0 = 0pt \else \nobreak\vskip\skip0 \fi \fi
-        \fi
-      }%
-    }%
-    \penalty\count255
+  %
+  % Remember, we are within a group.
+  \indexdummies % Must do this here, since \bf, etc expand at this stage
+  \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now
+      % so it will be output as is; and it will print as backslash.
+  %
+  % Process the index entry with all font commands turned off, to
+  % get the string to sort by.
+  {\indexnofonts
+   \edef\temp{\the\toks0}% need full expansion
+   \xdef\indexsorttmp{\temp}%
   }%
+  %
+  % Set up the complete index entry, with both the sort key and
+  % the original text, including any font commands.  We write
+  % three arguments to \entry to the .?? file (four in the
+  % subentry case), texindex reduces to two when writing the .??s
+  % sorted result.
+  \edef\temp{%
+    \write\writeto{%
+      \string\entry{\indexsorttmp}{\noexpand\folio}{\the\toks0}}%
+  }%
+  \temp
+}
+
+% Take care of unwanted page breaks/skips around a whatsit:
+%
+% If a skip is the last thing on the list now, preserve it
+% by backing up by \lastskip, doing the \write, then inserting
+% the skip again.  Otherwise, the whatsit generated by the
+% \write or \pdfdest will make \lastskip zero.  The result is that
+% sequences like this:
+% @end defun
+% @tindex whatever
+% @defun ...
+% will have extra space inserted, because the \medbreak in the
+% start of the @defun won't see the skip inserted by the @end of
+% the previous defun.
+%
+% But don't do any of this if we're not in vertical mode.  We
+% don't want to do a \vskip and prematurely end a paragraph.
+%
+% Avoid page breaks due to these extra skips, too.
+%
+% But wait, there is a catch there:
+% We'll have to check whether \lastskip is zero skip.  \ifdim is not
+% sufficient for this purpose, as it ignores stretch and shrink parts
+% of the skip.  The only way seems to be to check the textual
+% representation of the skip.
+%
+% The following is almost like \def\zeroskipmacro{0.0pt} except that
+% the ``p'' and ``t'' characters have catcode \other, not 11 (letter).
+%
+\edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname}
+%
+\newskip\whatsitskip
+\newcount\whatsitpenalty
+%
+% ..., ready, GO:
+%
+\def\safewhatsit#1{%
+\ifhmode
+  #1%
+\else
+  % \lastskip and \lastpenalty cannot both be nonzero simultaneously.
+  \whatsitskip = \lastskip
+  \edef\lastskipmacro{\the\lastskip}%
+  \whatsitpenalty = \lastpenalty
+  %
+  % If \lastskip is nonzero, that means the last item was a
+  % skip.  And since a skip is discardable, that means this
+  % -\skip0 glue we're inserting is preceded by a
+  % non-discardable item, therefore it is not a potential
+  % breakpoint, therefore no \nobreak needed.
+  \ifx\lastskipmacro\zeroskipmacro
+  \else
+    \vskip-\whatsitskip
+  \fi
+  %
+  #1%
+  %
+  \ifx\lastskipmacro\zeroskipmacro
+    % If \lastskip was zero, perhaps the last item was a penalty, and
+    % perhaps it was >=10000, e.g., a \nobreak.  In that case, we want
+    % to re-insert the same penalty (values >10000 are used for various
+    % signals); since we just inserted a non-discardable item, any
+    % following glue (such as a \parskip) would be a breakpoint.  For example:
+    % 
+    %   @deffn deffn-whatever
+    %   @vindex index-whatever
+    %   Description.
+    % would allow a break between the index-whatever whatsit
+    % and the "Description." paragraph.
+    \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi
+  \else
+    % On the other hand, if we had a nonzero \lastskip,
+    % this make-up glue would be preceded by a non-discardable item
+    % (the whatsit from the \write), so we must insert a \nobreak.
+    \nobreak\vskip\whatsitskip
+  \fi
+\fi
 }
 
 % The index entry written in the file actually looks like
@@ -3387,14 +4165,13 @@ width0pt\relax} \fi
 % @printindex causes a particular index (the ??s file) to get printed.
 % It does not print any chapter heading (usually an @unnumbered).
 %
-\def\printindex{\parsearg\doprintindex}
-\def\doprintindex#1{\begingroup
+\parseargdef\printindex{\begingroup
   \dobreak \chapheadingskip{10000}%
   %
   \smallfonts \rm
   \tolerance = 9500
+  \plainfrenchspacing
   \everypar = {}% don't want the \kern\-parindent from indentation suppression.
-  \indexbreaks
   %
   % See if the index file exists and is nonempty.
   % Change catcode of @ here so that if the index file contains
@@ -3421,7 +4198,7 @@ width0pt\relax} \fi
       % Index files are almost Texinfo source, but we use \ as the escape
       % character.  It would be better to use @, but that's too big a change
       % to make right now.
-      \def\indexbackslash{\rawbackslashxx}%
+      \def\indexbackslash{\backslashcurfont}%
       \catcode`\\ = 0
       \escapechar = `\\
       \begindoublecolumns
@@ -3443,7 +4220,10 @@ width0pt\relax} \fi
   \removelastskip
   %
   % We like breaks before the index initials, so insert a bonus.
-  \penalty -300
+  \nobreak
+  \vskip 0pt plus 3\baselineskip
+  \penalty 0
+  \vskip 0pt plus -3\baselineskip
   %
   % Typeset the initial.  Making this add up to a whole number of
   % baselineskips increases the chance of the dots lining up from column
@@ -3453,84 +4233,104 @@ width0pt\relax} \fi
   % No shrink because it confuses \balancecolumns.
   \vskip 1.67\baselineskip plus .5\baselineskip
   \leftline{\secbf #1}%
-  \vskip .33\baselineskip plus .1\baselineskip
-  %
   % Do our best not to break after the initial.
   \nobreak
+  \vskip .33\baselineskip plus .1\baselineskip
 }}
 
-% This typesets a paragraph consisting of #1, dot leaders, and then #2
-% flush to the right margin.  It is used for index and table of contents
-% entries.  The paragraph is indented by \leftskip.
+% \entry typesets a paragraph consisting of the text (#1), dot leaders, and
+% then page number (#2) flushed to the right margin.  It is used for index
+% and table of contents entries.  The paragraph is indented by \leftskip.
 %
-\def\entry#1#2{\begingroup
-  %
-  % Start a new paragraph if necessary, so our assignments below can't
-  % affect previous text.
-  \par
-  %
-  % Do not fill out the last line with white space.
-  \parfillskip = 0in
-  %
-  % No extra space above this paragraph.
-  \parskip = 0in
-  %
-  % Do not prefer a separate line ending with a hyphen to fewer lines.
-  \finalhyphendemerits = 0
-  %
-  % \hangindent is only relevant when the entry text and page number
-  % don't both fit on one line.  In that case, bob suggests starting the
-  % dots pretty far over on the line.  Unfortunately, a large
-  % indentation looks wrong when the entry text itself is broken across
-  % lines.  So we use a small indentation and put up with long leaders.
-  %
-  % \hangafter is reset to 1 (which is the value we want) at the start
-  % of each paragraph, so we need not do anything with that.
-  \hangindent = 2em
-  %
-  % When the entry text needs to be broken, just fill out the first line
-  % with blank space.
-  \rightskip = 0pt plus1fil
-  %
-  % A bit of stretch before each entry for the benefit of balancing columns.
-  \vskip 0pt plus1pt
-  %
-  % Start a ``paragraph'' for the index entry so the line breaking
-  % parameters we've set above will have an effect.
-  \noindent
-  %
-  % Insert the text of the index entry.  TeX will do line-breaking on it.
-  #1%
-  % The following is kludged to not output a line of dots in the index if
-  % there are no page numbers.  The next person who breaks this will be
-  % cursed by a Unix daemon.
-  \def\tempa{{\rm }}%
-  \def\tempb{#2}%
-  \edef\tempc{\tempa}%
-  \edef\tempd{\tempb}%
-  \ifx\tempc\tempd\ \else%
+% A straightforward implementation would start like this:
+%	\def\entry#1#2{...
+% But this frozes the catcodes in the argument, and can cause problems to
+% @code, which sets - active.  This problem was fixed by a kludge---
+% ``-'' was active throughout whole index, but this isn't really right.
+%
+% The right solution is to prevent \entry from swallowing the whole text.
+%                                 --kasal, 21nov03
+\def\entry{%
+  \begingroup
+    %
+    % Start a new paragraph if necessary, so our assignments below can't
+    % affect previous text.
+    \par
+    %
+    % Do not fill out the last line with white space.
+    \parfillskip = 0in
+    %
+    % No extra space above this paragraph.
+    \parskip = 0in
+    %
+    % Do not prefer a separate line ending with a hyphen to fewer lines.
+    \finalhyphendemerits = 0
+    %
+    % \hangindent is only relevant when the entry text and page number
+    % don't both fit on one line.  In that case, bob suggests starting the
+    % dots pretty far over on the line.  Unfortunately, a large
+    % indentation looks wrong when the entry text itself is broken across
+    % lines.  So we use a small indentation and put up with long leaders.
+    %
+    % \hangafter is reset to 1 (which is the value we want) at the start
+    % of each paragraph, so we need not do anything with that.
+    \hangindent = 2em
+    %
+    % When the entry text needs to be broken, just fill out the first line
+    % with blank space.
+    \rightskip = 0pt plus1fil
     %
-    % If we must, put the page number on a line of its own, and fill out
-    % this line with blank space.  (The \hfil is overwhelmed with the
-    % fill leaders glue in \indexdotfill if the page number does fit.)
-    \hfil\penalty50
-    \null\nobreak\indexdotfill % Have leaders before the page number.
+    % A bit of stretch before each entry for the benefit of balancing
+    % columns.
+    \vskip 0pt plus1pt
     %
-    % The `\ ' here is removed by the implicit \unskip that TeX does as
-    % part of (the primitive) \par.  Without it, a spurious underfull
-    % \hbox ensues.
-    \ifpdf
-      \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
+    % Swallow the left brace of the text (first parameter):
+    \afterassignment\doentry
+    \let\temp =
+}
+\def\doentry{%
+    \bgroup % Instead of the swallowed brace.
+      \noindent
+      \aftergroup\finishentry
+      % And now comes the text of the entry.
+}
+\def\finishentry#1{%
+    % #1 is the page number.
+    %
+    % The following is kludged to not output a line of dots in the index if
+    % there are no page numbers.  The next person who breaks this will be
+    % cursed by a Unix daemon.
+    \def\tempa{{\rm }}%
+    \def\tempb{#1}%
+    \edef\tempc{\tempa}%
+    \edef\tempd{\tempb}%
+    \ifx\tempc\tempd
+      \ %
     \else
-      \ #2% The page number ends the paragraph.
+      %
+      % If we must, put the page number on a line of its own, and fill out
+      % this line with blank space.  (The \hfil is overwhelmed with the
+      % fill leaders glue in \indexdotfill if the page number does fit.)
+      \hfil\penalty50
+      \null\nobreak\indexdotfill % Have leaders before the page number.
+      %
+      % The `\ ' here is removed by the implicit \unskip that TeX does as
+      % part of (the primitive) \par.  Without it, a spurious underfull
+      % \hbox ensues.
+      \ifpdf
+	\pdfgettoks#1.%
+	\ \the\toksA
+      \else
+	\ #1%
+      \fi
     \fi
-  \fi%
-  \par
-\endgroup}
+    \par
+  \endgroup
+}
 
-% Like \dotfill except takes at least 1 em.
+% Like plain.tex's \dotfill, except uses up at least 1 em.
 \def\indexdotfill{\cleaders
-  \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus 1fill}
+  \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill}
 
 \def\primary #1{\line{#1\hfil}}
 
@@ -3640,6 +4440,34 @@ width0pt\relax} \fi
 %
 % All done with double columns.
 \def\enddoublecolumns{%
+  % The following penalty ensures that the page builder is exercised
+  % _before_ we change the output routine.  This is necessary in the
+  % following situation:
+  %
+  % The last section of the index consists only of a single entry.
+  % Before this section, \pagetotal is less than \pagegoal, so no
+  % break occurs before the last section starts.  However, the last
+  % section, consisting of \initial and the single \entry, does not
+  % fit on the page and has to be broken off.  Without the following
+  % penalty the page builder will not be exercised until \eject
+  % below, and by that time we'll already have changed the output
+  % routine to the \balancecolumns version, so the next-to-last
+  % double-column page will be processed with \balancecolumns, which
+  % is wrong:  The two columns will go to the main vertical list, with
+  % the broken-off section in the recent contributions.  As soon as
+  % the output routine finishes, TeX starts reconsidering the page
+  % break.  The two columns and the broken-off section both fit on the
+  % page, because the two columns now take up only half of the page
+  % goal.  When TeX sees \eject from below which follows the final
+  % section, it invokes the new output routine that we've set after
+  % \balancecolumns below; \onepageout will try to fit the two columns
+  % and the final section into the vbox of \pageheight (see
+  % \pagebody), causing an overfull box.
+  %
+  % Note that glue won't work here, because glue does not exercise the
+  % page builder, unlike penalties (see The TeXbook, pp. 280-281).
+  \penalty0
+  %
   \output = {%
     % Split the last of the double-column material.  Leave it on the
     % current page, no automatic page break.
@@ -3695,6 +4523,12 @@ width0pt\relax} \fi
 \message{sectioning,}
 % Chapters, sections, etc.
 
+% \unnumberedno is an oxymoron, of course.  But we count the unnumbered
+% sections so that we can refer to them unambiguously in the pdf
+% outlines by their "section number".  We avoid collisions with chapter
+% numbers by starting them at 10000.  (If a document ever has 10000
+% chapters, we're in trouble anyway, I'm sure.)
+\newcount\unnumberedno \unnumberedno = 10000
 \newcount\chapno
 \newcount\secno        \secno=0
 \newcount\subsecno     \subsecno=0
@@ -3702,9 +4536,12 @@ width0pt\relax} \fi
 
 % This counter is funny since it counts through charcodes of letters A, B, ...
 \newcount\appendixno  \appendixno = `\@
+%
 % \def\appendixletter{\char\the\appendixno}
-% We do the following for the sake of pdftex, which needs the actual
+% We do the following ugly conditional instead of the above simple
+% construct for the sake of pdftex, which needs the actual
 % letter in the expansion, not just typeset.
+%
 \def\appendixletter{%
   \ifnum\appendixno=`A A%
   \else\ifnum\appendixno=`B B%
@@ -3742,11 +4579,12 @@ width0pt\relax} \fi
 
 % Each @chapter defines this as the name of the chapter.
 % page headings and footings can use it.  @section does likewise.
+% However, they are not reliable, because we don't use marks.
 \def\thischapter{}
 \def\thissection{}
 
 \newcount\absseclevel % used to calculate proper heading level
-\newcount\secbase\secbase=0 % @raise/lowersections modify this count
+\newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count
 
 % @raisesections: treat @section as chapter, @subsection as section, etc.
 \def\raisesections{\global\advance\secbase by -1}
@@ -3756,121 +4594,142 @@ width0pt\relax} \fi
 \def\lowersections{\global\advance\secbase by 1}
 \let\down=\lowersections % original BFox name
 
-% Choose a numbered-heading macro
-% #1 is heading level if unmodified by @raisesections or @lowersections
-% #2 is text for heading
-\def\numhead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
-\ifcase\absseclevel
-  \chapterzzz{#2}
-\or
-  \seczzz{#2}
-\or
-  \numberedsubseczzz{#2}
-\or
-  \numberedsubsubseczzz{#2}
-\else
-  \ifnum \absseclevel<0
-    \chapterzzz{#2}
+% we only have subsub.
+\chardef\maxseclevel = 3
+%
+% A numbered section within an unnumbered changes to unnumbered too.
+% To achive this, remember the "biggest" unnum. sec. we are currently in:
+\chardef\unmlevel = \maxseclevel
+%
+% Trace whether the current chapter is an appendix or not:
+% \chapheadtype is "N" or "A", unnumbered chapters are ignored.
+\def\chapheadtype{N}
+
+% Choose a heading macro
+% #1 is heading type
+% #2 is heading level
+% #3 is text for heading
+\def\genhead#1#2#3{%
+  % Compute the abs. sec. level:
+  \absseclevel=#2
+  \advance\absseclevel by \secbase
+  % Make sure \absseclevel doesn't fall outside the range:
+  \ifnum \absseclevel < 0
+    \absseclevel = 0
   \else
-    \numberedsubsubseczzz{#2}
+    \ifnum \absseclevel > 3
+      \absseclevel = 3
+    \fi
   \fi
-\fi
-\suppressfirstparagraphindent
-}
-
-% like \numhead, but chooses appendix heading levels
-\def\apphead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
-\ifcase\absseclevel
-  \appendixzzz{#2}
-\or
-  \appendixsectionzzz{#2}
-\or
-  \appendixsubseczzz{#2}
-\or
-  \appendixsubsubseczzz{#2}
-\else
-  \ifnum \absseclevel<0
-    \appendixzzz{#2}
+  % The heading type:
+  \def\headtype{#1}%
+  \if \headtype U%
+    \ifnum \absseclevel < \unmlevel
+      \chardef\unmlevel = \absseclevel
+    \fi
   \else
-    \appendixsubsubseczzz{#2}
+    % Check for appendix sections:
+    \ifnum \absseclevel = 0
+      \edef\chapheadtype{\headtype}%
+    \else
+      \if \headtype A\if \chapheadtype N%
+	\errmessage{@appendix... within a non-appendix chapter}%
+      \fi\fi
+    \fi
+    % Check for numbered within unnumbered:
+    \ifnum \absseclevel > \unmlevel
+      \def\headtype{U}%
+    \else
+      \chardef\unmlevel = 3
+    \fi
   \fi
-\fi
-\suppressfirstparagraphindent
-}
-
-% like \numhead, but chooses numberless heading levels
-\def\unnmhead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
-\ifcase\absseclevel
-  \unnumberedzzz{#2}
-\or
-  \unnumberedseczzz{#2}
-\or
-  \unnumberedsubseczzz{#2}
-\or
-  \unnumberedsubsubseczzz{#2}
-\else
-  \ifnum \absseclevel<0
-    \unnumberedzzz{#2}
+  % Now print the heading:
+  \if \headtype U%
+    \ifcase\absseclevel
+	\unnumberedzzz{#3}%
+    \or \unnumberedseczzz{#3}%
+    \or \unnumberedsubseczzz{#3}%
+    \or \unnumberedsubsubseczzz{#3}%
+    \fi
   \else
-    \unnumberedsubsubseczzz{#2}
+    \if \headtype A%
+      \ifcase\absseclevel
+	  \appendixzzz{#3}%
+      \or \appendixsectionzzz{#3}%
+      \or \appendixsubseczzz{#3}%
+      \or \appendixsubsubseczzz{#3}%
+      \fi
+    \else
+      \ifcase\absseclevel
+	  \chapterzzz{#3}%
+      \or \seczzz{#3}%
+      \or \numberedsubseczzz{#3}%
+      \or \numberedsubsubseczzz{#3}%
+      \fi
+    \fi
   \fi
-\fi
-\suppressfirstparagraphindent
-}
-
-% @chapter, @appendix, @unnumbered.
-\def\thischaptername{No Chapter Title}
-\outer\def\chapter{\parsearg\chapteryyy}
-\def\chapteryyy #1{\numhead0{#1}} % normally numhead0 calls chapterzzz
-\def\chapterzzz #1{%
-  \secno=0 \subsecno=0 \subsubsecno=0
-  \global\advance \chapno by 1 \message{\putwordChapter\space \the\chapno}%
-  \chapmacro {#1}{\the\chapno}%
-  \gdef\thissection{#1}%
-  \gdef\thischaptername{#1}%
-  % We don't substitute the actual chapter name into \thischapter
-  % because we don't want its macros evaluated now.
-  \xdef\thischapter{\putwordChapter{} \the\chapno: \noexpand\thischaptername}%
-  \writetocentry{chap}{#1}{{\the\chapno}}
-  \donoderef
+  \suppressfirstparagraphindent
+}
+
+% an interface:
+\def\numhead{\genhead N}
+\def\apphead{\genhead A}
+\def\unnmhead{\genhead U}
+
+% @chapter, @appendix, @unnumbered.  Increment top-level counter, reset
+% all lower-level sectioning counters to zero.
+%
+% Also set \chaplevelprefix, which we prepend to @float sequence numbers
+% (e.g., figures), q.v.  By default (before any chapter), that is empty.
+\let\chaplevelprefix = \empty
+%
+\outer\parseargdef\chapter{\numhead0{#1}} % normally numhead0 calls chapterzzz
+\def\chapterzzz#1{%
+  % section resetting is \global in case the chapter is in a group, such
+  % as an @include file.
+  \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
+    \global\advance\chapno by 1
+  %
+  % Used for \float.
+  \gdef\chaplevelprefix{\the\chapno.}%
+  \resetallfloatnos
+  %
+  \message{\putwordChapter\space \the\chapno}%
+  %
+  % Write the actual heading.
+  \chapmacro{#1}{Ynumbered}{\the\chapno}%
+  %
+  % So @section and the like are numbered underneath this chapter.
   \global\let\section = \numberedsec
   \global\let\subsection = \numberedsubsec
   \global\let\subsubsection = \numberedsubsubsec
 }
 
-% we use \chapno to avoid indenting back
-\def\appendixbox#1{%
-  \setbox0 = \hbox{\putwordAppendix{} \the\chapno}%
-  \hbox to \wd0{#1\hss}}
-
-\outer\def\appendix{\parsearg\appendixyyy}
-\def\appendixyyy #1{\apphead0{#1}} % normally apphead0 calls appendixzzz
-\def\appendixzzz #1{%
-  \secno=0 \subsecno=0 \subsubsecno=0
-  \global\advance \appendixno by 1
-  \message{\putwordAppendix\space \appendixletter}%
-  \chapmacro {#1}{\appendixbox{\putwordAppendix{} \appendixletter}}%
-  \gdef\thissection{#1}%
-  \gdef\thischaptername{#1}%
-  \xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}%
-  \writetocentry{appendix}{#1}{{\appendixletter}}
-  \appendixnoderef
+\outer\parseargdef\appendix{\apphead0{#1}} % normally apphead0 calls appendixzzz
+\def\appendixzzz#1{%
+  \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
+    \global\advance\appendixno by 1
+  \gdef\chaplevelprefix{\appendixletter.}%
+  \resetallfloatnos
+  %
+  \def\appendixnum{\putwordAppendix\space \appendixletter}%
+  \message{\appendixnum}%
+  %
+  \chapmacro{#1}{Yappendix}{\appendixletter}%
+  %
   \global\let\section = \appendixsec
   \global\let\subsection = \appendixsubsec
   \global\let\subsubsection = \appendixsubsubsec
 }
 
-% @centerchap is like @unnumbered, but the heading is centered.
-\outer\def\centerchap{\parsearg\centerchapyyy}
-\def\centerchapyyy #1{{\let\unnumbchapmacro=\centerchapmacro \unnumberedyyy{#1}}}
-
-% @top is like @unnumbered.
-\outer\def\top{\parsearg\unnumberedyyy}
-
-\outer\def\unnumbered{\parsearg\unnumberedyyy}
-\def\unnumberedyyy #1{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
-\def\unnumberedzzz #1{%
-  \secno=0 \subsecno=0 \subsubsecno=0
+\outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
+\def\unnumberedzzz#1{%
+  \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
+    \global\advance\unnumberedno by 1
+  %
+  % Since an unnumbered has no number, no prefix for figures.
+  \global\let\chaplevelprefix = \empty
+  \resetallfloatnos
   %
   % This used to be simply \message{#1}, but TeX fully expands the
   % argument to \message.  Therefore, if #1 contained @-commands, TeX
@@ -3883,134 +4742,98 @@ width0pt\relax} \fi
   % \the<toks register> to achieve this: TeX expands \the<toks> only once,
   % simply yielding the contents of <toks register>.  (We also do this for
   % the toc entries.)
-  \toks0 = {#1}\message{(\the\toks0)}%
+  \toks0 = {#1}%
+  \message{(\the\toks0)}%
+  %
+  \chapmacro{#1}{Ynothing}{\the\unnumberedno}%
   %
-  \unnumbchapmacro {#1}%
-  \gdef\thischapter{#1}\gdef\thissection{#1}%
-  \writetocentry{unnumbchap}{#1}{{\the\chapno}}
-  \unnumbnoderef
   \global\let\section = \unnumberedsec
   \global\let\subsection = \unnumberedsubsec
   \global\let\subsubsection = \unnumberedsubsubsec
 }
 
+% @centerchap is like @unnumbered, but the heading is centered.
+\outer\parseargdef\centerchap{%
+  % Well, we could do the following in a group, but that would break
+  % an assumption that \chapmacro is called at the outermost level.
+  % Thus we are safer this way:		--kasal, 24feb04
+  \let\centerparametersmaybe = \centerparameters
+  \unnmhead0{#1}%
+  \let\centerparametersmaybe = \relax
+}
+
+% @top is like @unnumbered.
+\let\top\unnumbered
+
 % Sections.
-\outer\def\numberedsec{\parsearg\secyyy}
-\def\secyyy #1{\numhead1{#1}} % normally calls seczzz
-\def\seczzz #1{%
-  \subsecno=0 \subsubsecno=0 \global\advance \secno by 1 %
-  \gdef\thissection{#1}\secheading {#1}{\the\chapno}{\the\secno}%
-  \writetocentry{sec}{#1}{{\the\chapno}{\the\secno}}
-  \donoderef
-  \nobreak
+\outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz
+\def\seczzz#1{%
+  \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
+  \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}%
 }
 
-\outer\def\appendixsection{\parsearg\appendixsecyyy}
-\outer\def\appendixsec{\parsearg\appendixsecyyy}
-\def\appendixsecyyy #1{\apphead1{#1}} % normally calls appendixsectionzzz
-\def\appendixsectionzzz #1{%
-  \subsecno=0 \subsubsecno=0 \global\advance \secno by 1 %
-  \gdef\thissection{#1}\secheading {#1}{\appendixletter}{\the\secno}%
-  \writetocentry{sec}{#1}{{\appendixletter}{\the\secno}}
-  \appendixnoderef
-  \nobreak
+\outer\parseargdef\appendixsection{\apphead1{#1}} % normally calls appendixsectionzzz
+\def\appendixsectionzzz#1{%
+  \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
+  \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}%
 }
+\let\appendixsec\appendixsection
 
-\outer\def\unnumberedsec{\parsearg\unnumberedsecyyy}
-\def\unnumberedsecyyy #1{\unnmhead1{#1}} % normally calls unnumberedseczzz
-\def\unnumberedseczzz #1{%
-  \plainsecheading {#1}\gdef\thissection{#1}%
-  \writetocentry{unnumbsec}{#1}{{\the\chapno}{\the\secno}}
-  \unnumbnoderef
-  \nobreak
+\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} % normally calls unnumberedseczzz
+\def\unnumberedseczzz#1{%
+  \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
+  \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}%
 }
 
 % Subsections.
-\outer\def\numberedsubsec{\parsearg\numberedsubsecyyy}
-\def\numberedsubsecyyy #1{\numhead2{#1}} % normally calls numberedsubseczzz
-\def\numberedsubseczzz #1{%
-  \gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 %
-  \subsecheading {#1}{\the\chapno}{\the\secno}{\the\subsecno}%
-  \writetocentry{subsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}}
-  \donoderef
-  \nobreak
+\outer\parseargdef\numberedsubsec{\numhead2{#1}} % normally calls numberedsubseczzz
+\def\numberedsubseczzz#1{%
+  \global\subsubsecno=0  \global\advance\subsecno by 1
+  \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}%
 }
 
-\outer\def\appendixsubsec{\parsearg\appendixsubsecyyy}
-\def\appendixsubsecyyy #1{\apphead2{#1}} % normally calls appendixsubseczzz
-\def\appendixsubseczzz #1{%
-  \gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 %
-  \subsecheading {#1}{\appendixletter}{\the\secno}{\the\subsecno}%
-  \writetocentry{subsec}{#1}{{\appendixletter}{\the\secno}{\the\subsecno}}
-  \appendixnoderef
-  \nobreak
+\outer\parseargdef\appendixsubsec{\apphead2{#1}} % normally calls appendixsubseczzz
+\def\appendixsubseczzz#1{%
+  \global\subsubsecno=0  \global\advance\subsecno by 1
+  \sectionheading{#1}{subsec}{Yappendix}%
+                 {\appendixletter.\the\secno.\the\subsecno}%
 }
 
-\outer\def\unnumberedsubsec{\parsearg\unnumberedsubsecyyy}
-\def\unnumberedsubsecyyy #1{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
-\def\unnumberedsubseczzz #1{%
-  \plainsubsecheading {#1}\gdef\thissection{#1}%
-  \writetocentry{unnumbsubsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}}
-  \unnumbnoderef
-  \nobreak
+\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
+\def\unnumberedsubseczzz#1{%
+  \global\subsubsecno=0  \global\advance\subsecno by 1
+  \sectionheading{#1}{subsec}{Ynothing}%
+                 {\the\unnumberedno.\the\secno.\the\subsecno}%
 }
 
 % Subsubsections.
-\outer\def\numberedsubsubsec{\parsearg\numberedsubsubsecyyy}
-\def\numberedsubsubsecyyy #1{\numhead3{#1}} % normally numberedsubsubseczzz
-\def\numberedsubsubseczzz #1{%
-  \gdef\thissection{#1}\global\advance \subsubsecno by 1 %
-  \subsubsecheading {#1}
-    {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}%
-  \writetocentry{subsubsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}}
-  \donoderef
-  \nobreak
+\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} % normally numberedsubsubseczzz
+\def\numberedsubsubseczzz#1{%
+  \global\advance\subsubsecno by 1
+  \sectionheading{#1}{subsubsec}{Ynumbered}%
+                 {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}%
 }
 
-\outer\def\appendixsubsubsec{\parsearg\appendixsubsubsecyyy}
-\def\appendixsubsubsecyyy #1{\apphead3{#1}} % normally appendixsubsubseczzz
-\def\appendixsubsubseczzz #1{%
-  \gdef\thissection{#1}\global\advance \subsubsecno by 1 %
-  \subsubsecheading {#1}
-    {\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}%
-  \writetocentry{subsubsec}{#1}{{\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}}
-  \appendixnoderef
-  \nobreak
+\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} % normally appendixsubsubseczzz
+\def\appendixsubsubseczzz#1{%
+  \global\advance\subsubsecno by 1
+  \sectionheading{#1}{subsubsec}{Yappendix}%
+                 {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}%
 }
 
-\outer\def\unnumberedsubsubsec{\parsearg\unnumberedsubsubsecyyy}
-\def\unnumberedsubsubsecyyy #1{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
-\def\unnumberedsubsubseczzz #1{%
-  \plainsubsubsecheading {#1}\gdef\thissection{#1}%
-  \writetocentry{unnumbsubsubsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}}
-  \unnumbnoderef
-  \nobreak
+\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
+\def\unnumberedsubsubseczzz#1{%
+  \global\advance\subsubsecno by 1
+  \sectionheading{#1}{subsubsec}{Ynothing}%
+                 {\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}%
 }
 
-% These are variants which are not "outer", so they can appear in @ifinfo.
-% Actually, they should now be obsolete; ordinary section commands should work.
-\def\infotop{\parsearg\unnumberedzzz}
-\def\infounnumbered{\parsearg\unnumberedzzz}
-\def\infounnumberedsec{\parsearg\unnumberedseczzz}
-\def\infounnumberedsubsec{\parsearg\unnumberedsubseczzz}
-\def\infounnumberedsubsubsec{\parsearg\unnumberedsubsubseczzz}
-
-\def\infoappendix{\parsearg\appendixzzz}
-\def\infoappendixsec{\parsearg\appendixseczzz}
-\def\infoappendixsubsec{\parsearg\appendixsubseczzz}
-\def\infoappendixsubsubsec{\parsearg\appendixsubsubseczzz}
-
-\def\infochapter{\parsearg\chapterzzz}
-\def\infosection{\parsearg\sectionzzz}
-\def\infosubsection{\parsearg\subsectionzzz}
-\def\infosubsubsection{\parsearg\subsubsectionzzz}
-
 % These macros control what the section commands do, according
 % to what kind of chapter we are in (ordinary, appendix, or unnumbered).
 % Define them by default for a numbered chapter.
-\global\let\section = \numberedsec
-\global\let\subsection = \numberedsubsec
-\global\let\subsubsection = \numberedsubsubsec
+\let\section = \numberedsec
+\let\subsection = \numberedsubsec
+\let\subsubsection = \numberedsubsubsec
 
 % Define @majorheading, @heading and @subheading
 
@@ -4023,23 +4846,27 @@ width0pt\relax} \fi
 %          if justification is not attempted.  Hence \raggedright.
 
 
-\def\majorheading{\parsearg\majorheadingzzz}
-\def\majorheadingzzz #1{%
+\def\majorheading{%
   {\advance\chapheadingskip by 10pt \chapbreak }%
-  {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                    \parindent=0pt\raggedright
-                    \rm #1\hfill}}\bigskip \par\penalty 200}
+  \parsearg\chapheadingzzz
+}
 
-\def\chapheading{\parsearg\chapheadingzzz}
-\def\chapheadingzzz #1{\chapbreak %
+\def\chapheading{\chapbreak \parsearg\chapheadingzzz}
+\def\chapheadingzzz#1{%
   {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
                     \parindent=0pt\raggedright
-                    \rm #1\hfill}}\bigskip \par\penalty 200}
+                    \rm #1\hfill}}%
+  \bigskip \par\penalty 200\relax
+  \suppressfirstparagraphindent
+}
 
 % @heading, @subheading, @subsubheading.
-\def\heading{\parsearg\plainsecheading}
-\def\subheading{\parsearg\plainsubsecheading}
-\def\subsubheading{\parsearg\plainsubsubsecheading}
+\parseargdef\heading{\sectionheading{#1}{sec}{Yomitfromtoc}{}
+  \suppressfirstparagraphindent}
+\parseargdef\subheading{\sectionheading{#1}{subsec}{Yomitfromtoc}{}
+  \suppressfirstparagraphindent}
+\parseargdef\subsubheading{\sectionheading{#1}{subsubsec}{Yomitfromtoc}{}
+  \suppressfirstparagraphindent}
 
 % These macros generate a chapter, section, etc. heading only
 % (including whitespace, linebreaking, etc. around it),
@@ -4048,8 +4875,6 @@ width0pt\relax} \fi
 %%% Args are the skip and penalty (usually negative)
 \def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi}
 
-\def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
-
 %%% Define plain chapter starts, and page on/off switching for it
 % Parameter controlling skip before chapter headings (if needed)
 
@@ -4072,7 +4897,7 @@ width0pt\relax} \fi
 \global\let\pagealignmacro=\chappager
 \global\def\HEADINGSon{\HEADINGSsingle}}
 
-\def\CHAPPAGodd{
+\def\CHAPPAGodd{%
 \global\let\contentsalignmacro = \chapoddpage
 \global\let\pchapsepmacro=\chapoddpage
 \global\let\pagealignmacro=\chapoddpage
@@ -4080,116 +4905,205 @@ width0pt\relax} \fi
 
 \CHAPPAGon
 
-\def\CHAPFplain{
-\global\let\chapmacro=\chfplain
-\global\let\unnumbchapmacro=\unnchfplain
-\global\let\centerchapmacro=\centerchfplain}
-
-% Plain chapter opening.
-% #1 is the text, #2 the chapter number or empty if unnumbered.
-\def\chfplain#1#2{%
+% Chapter opening.
+%
+% #1 is the text, #2 is the section type (Ynumbered, Ynothing,
+% Yappendix, Yomitfromtoc), #3 the chapter number.
+%
+% To test against our argument.
+\def\Ynothingkeyword{Ynothing}
+\def\Yomitfromtockeyword{Yomitfromtoc}
+\def\Yappendixkeyword{Yappendix}
+%
+\def\chapmacro#1#2#3{%
   \pchapsepmacro
   {%
     \chapfonts \rm
-    \def\chapnum{#2}%
-    \setbox0 = \hbox{#2\ifx\chapnum\empty\else\enspace\fi}%
+    %
+    % Have to define \thissection before calling \donoderef, because the
+    % xref code eventually uses it.  On the other hand, it has to be called
+    % after \pchapsepmacro, or the headline will change too soon.
+    \gdef\thissection{#1}%
+    \gdef\thischaptername{#1}%
+    %
+    % Only insert the separating space if we have a chapter/appendix
+    % number, and don't print the unnumbered ``number''.
+    \def\temptype{#2}%
+    \ifx\temptype\Ynothingkeyword
+      \setbox0 = \hbox{}%
+      \def\toctype{unnchap}%
+      \gdef\thischapternum{}%
+      \gdef\thischapter{#1}%
+    \else\ifx\temptype\Yomitfromtockeyword
+      \setbox0 = \hbox{}% contents like unnumbered, but no toc entry
+      \def\toctype{omit}%
+      \gdef\thischapternum{}%
+      \gdef\thischapter{}%
+    \else\ifx\temptype\Yappendixkeyword
+      \setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
+      \def\toctype{app}%
+      \xdef\thischapternum{\appendixletter}%
+      % We don't substitute the actual chapter name into \thischapter
+      % because we don't want its macros evaluated now.  And we don't
+      % use \thissection because that changes with each section.
+      %
+      \xdef\thischapter{\putwordAppendix{} \appendixletter:
+                        \noexpand\thischaptername}%
+    \else
+      \setbox0 = \hbox{#3\enspace}%
+      \def\toctype{numchap}%
+      \xdef\thischapternum{\the\chapno}%
+      \xdef\thischapter{\putwordChapter{} \the\chapno:
+                        \noexpand\thischaptername}%
+    \fi\fi\fi
+    %
+    % Write the toc entry for this chapter.  Must come before the
+    % \donoderef, because we include the current node name in the toc
+    % entry, and \donoderef resets it to empty.
+    \writetocentry{\toctype}{#1}{#3}%
+    %
+    % For pdftex, we have to write out the node definition (aka, make
+    % the pdfdest) after any page break, but before the actual text has
+    % been typeset.  If the destination for the pdf outline is after the
+    % text, then jumping from the outline may wind up with the text not
+    % being visible, for instance under high magnification.
+    \donoderef{#2}%
+    %
+    % Typeset the actual heading.
     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
-          \hangindent = \wd0 \centerparametersmaybe
+          \hangindent=\wd0 \centerparametersmaybe
           \unhbox0 #1\par}%
   }%
   \nobreak\bigskip % no page break after a chapter title
   \nobreak
 }
 
-% Plain opening for unnumbered.
-\def\unnchfplain#1{\chfplain{#1}{}}
-
 % @centerchap -- centered and unnumbered.
 \let\centerparametersmaybe = \relax
-\def\centerchfplain#1{{%
-  \def\centerparametersmaybe{%
-    \advance\rightskip by 3\rightskip
-    \leftskip = \rightskip
-    \parfillskip = 0pt
-  }%
-  \chfplain{#1}{}%
-}}
+\def\centerparameters{%
+  \advance\rightskip by 3\rightskip
+  \leftskip = \rightskip
+  \parfillskip = 0pt
+}
 
-\CHAPFplain % The default
 
+% I don't think this chapter style is supported any more, so I'm not
+% updating it with the new noderef stuff.  We'll see.  --karl, 11aug03.
+%
+\def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
+%
 \def\unnchfopen #1{%
 \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
                        \parindent=0pt\raggedright
                        \rm #1\hfill}}\bigskip \par\nobreak
 }
-
 \def\chfopen #1#2{\chapoddpage {\chapfonts
 \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
 \par\penalty 5000 %
 }
-
 \def\centerchfopen #1{%
 \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
                        \parindent=0pt
                        \hfill {\rm #1}\hfill}}\bigskip \par\nobreak
 }
+\def\CHAPFopen{%
+  \global\let\chapmacro=\chfopen
+  \global\let\centerchapmacro=\centerchfopen}
 
-\def\CHAPFopen{
-\global\let\chapmacro=\chfopen
-\global\let\unnumbchapmacro=\unnchfopen
-\global\let\centerchapmacro=\centerchfopen}
 
-
-% Section titles.
+% Section titles.  These macros combine the section number parts and
+% call the generic \sectionheading to do the printing.
+%
 \newskip\secheadingskip
-\def\secheadingbreak{\dobreak \secheadingskip {-1000}}
-\def\secheading#1#2#3{\sectionheading{sec}{#2.#3}{#1}}
-\def\plainsecheading#1{\sectionheading{sec}{}{#1}}
+\def\secheadingbreak{\dobreak \secheadingskip{-1000}}
 
 % Subsection titles.
-\newskip \subsecheadingskip
-\def\subsecheadingbreak{\dobreak \subsecheadingskip {-500}}
-\def\subsecheading#1#2#3#4{\sectionheading{subsec}{#2.#3.#4}{#1}}
-\def\plainsubsecheading#1{\sectionheading{subsec}{}{#1}}
+\newskip\subsecheadingskip
+\def\subsecheadingbreak{\dobreak \subsecheadingskip{-500}}
 
 % Subsubsection titles.
-\let\subsubsecheadingskip = \subsecheadingskip
-\let\subsubsecheadingbreak = \subsecheadingbreak
-\def\subsubsecheading#1#2#3#4#5{\sectionheading{subsubsec}{#2.#3.#4.#5}{#1}}
-\def\plainsubsubsecheading#1{\sectionheading{subsubsec}{}{#1}}
+\def\subsubsecheadingskip{\subsecheadingskip}
+\def\subsubsecheadingbreak{\subsecheadingbreak}
 
 
-% Print any size section title.
+% Print any size, any type, section title.
 %
-% #1 is the section type (sec/subsec/subsubsec), #2 is the section
-% number (maybe empty), #3 the text.
-\def\sectionheading#1#2#3{%
-  {%
-    \expandafter\advance\csname #1headingskip\endcsname by \parskip
-    \csname #1headingbreak\endcsname
-  }%
+% #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is
+% the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the
+% section number.
+%
+\def\sectionheading#1#2#3#4{%
   {%
     % Switch to the right set of fonts.
-    \csname #1fonts\endcsname \rm
+    \csname #2fonts\endcsname \rm
+    %
+    % Insert space above the heading.
+    \csname #2headingbreak\endcsname
+    %
+    % Only insert the space after the number if we have a section number.
+    \def\sectionlevel{#2}%
+    \def\temptype{#3}%
+    %
+    \ifx\temptype\Ynothingkeyword
+      \setbox0 = \hbox{}%
+      \def\toctype{unn}%
+      \gdef\thissection{#1}%
+    \else\ifx\temptype\Yomitfromtockeyword
+      % for @headings -- no section number, don't include in toc,
+      % and don't redefine \thissection.
+      \setbox0 = \hbox{}%
+      \def\toctype{omit}%
+      \let\sectionlevel=\empty
+    \else\ifx\temptype\Yappendixkeyword
+      \setbox0 = \hbox{#4\enspace}%
+      \def\toctype{app}%
+      \gdef\thissection{#1}%
+    \else
+      \setbox0 = \hbox{#4\enspace}%
+      \def\toctype{num}%
+      \gdef\thissection{#1}%
+    \fi\fi\fi
+    %
+    % Write the toc entry (before \donoderef).  See comments in \chapmacro.
+    \writetocentry{\toctype\sectionlevel}{#1}{#4}%
+    %
+    % Write the node reference (= pdf destination for pdftex).
+    % Again, see comments in \chapmacro.
+    \donoderef{#3}%
     %
-    % Only insert the separating space if we have a section number.
-    \def\secnum{#2}%
-    \setbox0 = \hbox{#2\ifx\secnum\empty\else\enspace\fi}%
+    % Interline glue will be inserted when the vbox is completed.
+    % That glue will be a valid breakpoint for the page, since it'll be
+    % preceded by a whatsit (usually from the \donoderef, or from the
+    % \writetocentry if there was no node).  We don't want to allow that
+    % break, since then the whatsits could end up on page n while the
+    % section is on page n+1, thus toc/etc. are wrong.  Debian bug 276000.
+    \nobreak
     %
+    % Output the actual section heading.
     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
-          \hangindent = \wd0 % zero if no section number
-          \unhbox0 #3}%
+          \hangindent=\wd0  % zero if no section number
+          \unhbox0 #1}%
   }%
-  % Add extra space after the heading -- either a line space or a
-  % paragraph space, whichever is more.  (Some people like to set
-  % \parskip to large values for some reason.)  Don't allow stretch, though.
-  \nobreak
-  \ifdim\parskip>\normalbaselineskip
-    \kern\parskip
-  \else
-    \kern\normalbaselineskip
-  \fi
+  % Add extra space after the heading -- half of whatever came above it.
+  % Don't allow stretch, though.
+  \kern .5 \csname #2headingskip\endcsname
+  %
+  % Do not let the kern be a potential breakpoint, as it would be if it
+  % was followed by glue.
   \nobreak
+  %
+  % We'll almost certainly start a paragraph next, so don't let that
+  % glue accumulate.  (Not a breakpoint because it's preceded by a
+  % discardable item.)
+  \vskip-\parskip
+  % 
+  % This is purely so the last item on the list is a known \penalty >
+  % 10000.  This is so \startdefun can avoid allowing breakpoints after
+  % section headings.  Otherwise, it would insert a valid breakpoint between:
+  % 
+  %   @section sec-whatever
+  %   @deffn def-whatever
+  \penalty 10001
 }
 
 
@@ -4198,119 +5112,173 @@ width0pt\relax} \fi
 \newwrite\tocfile
 
 % Write an entry to the toc file, opening it if necessary.
-% Called from @chapter, etc.  We supply {\folio} at the end of the
-% argument, which will end up as the last argument to the \...entry macro.
+% Called from @chapter, etc.
+%
+% Example usage: \writetocentry{sec}{Section Name}{\the\chapno.\the\secno}
+% We append the current node name (if any) and page number as additional
+% arguments for the \{chap,sec,...}entry macros which will eventually
+% read this.  The node name is used in the pdf outlines as the
+% destination to jump to.
 %
-% Usage: \writetocentry{chap}{The Name of The Game}{{\the\chapno}}
 % We open the .toc file for writing here instead of at @setfilename (or
 % any other fixed time) so that @contents can be anywhere in the document.
+% But if #1 is `omit', then we don't do anything.  This is used for the
+% table of contents chapter openings themselves.
 %
 \newif\iftocfileopened
+\def\omitkeyword{omit}%
+%
 \def\writetocentry#1#2#3{%
-  \iftocfileopened\else
-    \immediate\openout\tocfile = \jobname.toc
-    \global\tocfileopenedtrue
-  \fi
-  %
-  \iflinks
-    \toks0 = {#2}%
-    \edef\temp{\write\tocfile{\realbackslash #1entry{\the\toks0}#3{\folio}}}%
-    \temp
+  \edef\writetoctype{#1}%
+  \ifx\writetoctype\omitkeyword \else
+    \iftocfileopened\else
+      \immediate\openout\tocfile = \jobname.toc
+      \global\tocfileopenedtrue
+    \fi
+    %
+    \iflinks
+      {\atdummies
+       \edef\temp{%
+         \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}%
+       \temp
+      }%
+    \fi
   \fi
   %
-  % Tell \shipout to create a page destination if we're doing pdf, which
-  % will be the target of the links in the table of contents.  We can't
-  % just do it on every page because the title pages are numbered 1 and
-  % 2 (the page numbers aren't printed), and so are the first two pages
-  % of the document.  Thus, we'd have two destinations named `1', and
-  % two named `2'.
-  \ifpdf \pdfmakepagedesttrue \fi
+  % Tell \shipout to create a pdf destination on each page, if we're
+  % writing pdf.  These are used in the table of contents.  We can't
+  % just write one on every page because the title pages are numbered
+  % 1 and 2 (the page numbers aren't printed), and so are the first
+  % two pages of the document.  Thus, we'd have two destinations named
+  % `1', and two named `2'.
+  \ifpdf \global\pdfmakepagedesttrue \fi
+}
+
+
+% These characters do not print properly in the Computer Modern roman
+% fonts, so we must take special care.  This is more or less redundant
+% with the Texinfo input format setup at the end of this file.
+% 
+\def\activecatcodes{%
+  \catcode`\"=\active
+  \catcode`\$=\active
+  \catcode`\<=\active
+  \catcode`\>=\active
+  \catcode`\\=\active
+  \catcode`\^=\active
+  \catcode`\_=\active
+  \catcode`\|=\active
+  \catcode`\~=\active
+}
+
+
+% Read the toc file, which is essentially Texinfo input.
+\def\readtocfile{%
+  \setupdatafile
+  \activecatcodes
+  \input \jobname.toc
 }
 
 \newskip\contentsrightmargin \contentsrightmargin=1in
 \newcount\savepageno
 \newcount\lastnegativepageno \lastnegativepageno = -1
 
-% Finish up the main text and prepare to read what we've written
-% to \tocfile.
+% Prepare to read what we've written to \tocfile.
 %
 \def\startcontents#1{%
-   % If @setchapternewpage on, and @headings double, the contents should
-   % start on an odd page, unlike chapters.  Thus, we maintain
-   % \contentsalignmacro in parallel with \pagealignmacro.
-   % From: Torbjorn Granlund <[email protected]>
-   \contentsalignmacro
-   \immediate\closeout\tocfile
-   %
-   % Don't need to put `Contents' or `Short Contents' in the headline.
-   % It is abundantly clear what they are.
-   \unnumbchapmacro{#1}\def\thischapter{}%
-   \savepageno = \pageno
-   \begingroup                  % Set up to handle contents files properly.
-      \catcode`\\=0  \catcode`\{=1  \catcode`\}=2  \catcode`\@=11
-      % We can't do this, because then an actual ^ in a section
-      % title fails, e.g., @chapter ^ -- exponentiation.  --karl, 9jul97.
-      %\catcode`\^=7 % to see ^^e4 as \"a etc. [email protected]
-      \raggedbottom             % Worry more about breakpoints than the bottom.
-      \advance\hsize by -\contentsrightmargin % Don't use the full line length.
-      %
-      % Roman numerals for page numbers.
-      \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
+  % If @setchapternewpage on, and @headings double, the contents should
+  % start on an odd page, unlike chapters.  Thus, we maintain
+  % \contentsalignmacro in parallel with \pagealignmacro.
+  % From: Torbjorn Granlund <[email protected]>
+  \contentsalignmacro
+  \immediate\closeout\tocfile
+  %
+  % Don't need to put `Contents' or `Short Contents' in the headline.
+  % It is abundantly clear what they are.
+  \def\thischapter{}%
+  \chapmacro{#1}{Yomitfromtoc}{}%
+  %
+  \savepageno = \pageno
+  \begingroup                  % Set up to handle contents files properly.
+    \raggedbottom              % Worry more about breakpoints than the bottom.
+    \advance\hsize by -\contentsrightmargin % Don't use the full line length.
+    %
+    % Roman numerals for page numbers.
+    \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
 }
 
 
 % Normal (long) toc.
 \def\contents{%
-   \startcontents{\putwordTOC}%
-     \openin 1 \jobname.toc
-     \ifeof 1 \else
-       \closein 1
-       \input \jobname.toc
-     \fi
-     \vfill \eject
-     \contentsalignmacro % in case @setchapternewpage odd is in effect
-     \pdfmakeoutlines
-   \endgroup
-   \lastnegativepageno = \pageno
-   \global\pageno = \savepageno
+  \startcontents{\putwordTOC}%
+    \openin 1 \jobname.toc
+    \ifeof 1 \else
+      \readtocfile
+    \fi
+    \vfill \eject
+    \contentsalignmacro % in case @setchapternewpage odd is in effect
+    \ifeof 1 \else
+      \pdfmakeoutlines
+    \fi
+    \closein 1
+  \endgroup
+  \lastnegativepageno = \pageno
+  \global\pageno = \savepageno
 }
 
 % And just the chapters.
 \def\summarycontents{%
-   \startcontents{\putwordShortTOC}%
-      %
-      \let\chapentry = \shortchapentry
-      \let\appendixentry = \shortappendixentry
-      \let\unnumbchapentry = \shortunnumberedentry
-      % We want a true roman here for the page numbers.
-      \secfonts
-      \let\rm=\shortcontrm \let\bf=\shortcontbf
-      \let\sl=\shortcontsl \let\tt=\shortconttt
-      \rm
-      \hyphenpenalty = 10000
-      \advance\baselineskip by 1pt % Open it up a little.
-      \def\secentry ##1##2##3##4{}
-      \def\subsecentry ##1##2##3##4##5{}
-      \def\subsubsecentry ##1##2##3##4##5##6{}
-      \let\unnumbsecentry = \secentry
-      \let\unnumbsubsecentry = \subsecentry
-      \let\unnumbsubsubsecentry = \subsubsecentry
-      \openin 1 \jobname.toc
-      \ifeof 1 \else
-        \closein 1
-        \input \jobname.toc
-      \fi
-     \vfill \eject
-     \contentsalignmacro % in case @setchapternewpage odd is in effect
-   \endgroup
-   \lastnegativepageno = \pageno
-   \global\pageno = \savepageno
+  \startcontents{\putwordShortTOC}%
+    %
+    \let\numchapentry = \shortchapentry
+    \let\appentry = \shortchapentry
+    \let\unnchapentry = \shortunnchapentry
+    % We want a true roman here for the page numbers.
+    \secfonts
+    \let\rm=\shortcontrm \let\bf=\shortcontbf
+    \let\sl=\shortcontsl \let\tt=\shortconttt
+    \rm
+    \hyphenpenalty = 10000
+    \advance\baselineskip by 1pt % Open it up a little.
+    \def\numsecentry##1##2##3##4{}
+    \let\appsecentry = \numsecentry
+    \let\unnsecentry = \numsecentry
+    \let\numsubsecentry = \numsecentry
+    \let\appsubsecentry = \numsecentry
+    \let\unnsubsecentry = \numsecentry
+    \let\numsubsubsecentry = \numsecentry
+    \let\appsubsubsecentry = \numsecentry
+    \let\unnsubsubsecentry = \numsecentry
+    \openin 1 \jobname.toc
+    \ifeof 1 \else
+      \readtocfile
+    \fi
+    \closein 1
+    \vfill \eject
+    \contentsalignmacro % in case @setchapternewpage odd is in effect
+  \endgroup
+  \lastnegativepageno = \pageno
+  \global\pageno = \savepageno
 }
 \let\shortcontents = \summarycontents
 
-\ifpdf
-  \pdfcatalog{/PageMode /UseOutlines}%
-\fi
+% Typeset the label for a chapter or appendix for the short contents.
+% The arg is, e.g., `A' for an appendix, or `3' for a chapter.
+%
+\def\shortchaplabel#1{%
+  % This space should be enough, since a single number is .5em, and the
+  % widest letter (M) is 1em, at least in the Computer Modern fonts.
+  % But use \hss just in case.
+  % (This space doesn't include the extra space that gets added after
+  % the label; that gets put in by \shortchapentry above.)
+  %
+  % We'd like to right-justify chapter numbers, but that looks strange
+  % with appendix letters.  And right-justifying numbers and
+  % left-justifying letters looks strange when there is less than 10
+  % chapters.  Have to read the whole toc once to know how many chapters
+  % there are before deciding ...
+  \hbox to 1em{#1\hss}%
+}
 
 % These macros generate individual entries in the table of contents.
 % The first argument is the chapter or section name.
@@ -4318,58 +5286,46 @@ width0pt\relax} \fi
 % The arguments in between are the chapter number, section number, ...
 
 % Chapters, in the main contents.
-\def\chapentry#1#2#3{\dochapentry{#2\labelspace#1}{#3}}
+\def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}}
 %
 % Chapters, in the short toc.
 % See comments in \dochapentry re vbox and related settings.
-\def\shortchapentry#1#2#3{%
-  \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#3\egroup}%
+\def\shortchapentry#1#2#3#4{%
+  \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}%
 }
 
 % Appendices, in the main contents.
-\def\appendixentry#1#2#3{%
-  \dochapentry{\appendixbox{\putwordAppendix{} #2}\labelspace#1}{#3}}
-%
-% Appendices, in the short toc.
-\let\shortappendixentry = \shortchapentry
-
-% Typeset the label for a chapter or appendix for the short contents.
-% The arg is, e.g., `Appendix A' for an appendix, or `3' for a chapter.
-% We could simplify the code here by writing out an \appendixentry
-% command in the toc file for appendices, instead of using \chapentry
-% for both, but it doesn't seem worth it.
+% Need the word Appendix, and a fixed-size box.
 %
-\newdimen\shortappendixwidth
+\def\appendixbox#1{%
+  % We use M since it's probably the widest letter.
+  \setbox0 = \hbox{\putwordAppendix{} M}%
+  \hbox to \wd0{\putwordAppendix{} #1\hss}}
 %
-\def\shortchaplabel#1{%
-  % This space should be enough, since a single number is .5em, and the
-  % widest letter (M) is 1em, at least in the Computer Modern fonts.
-  % But use \hss just in case.
-  % (This space doesn't include the extra space that gets added after
-  % the label; that gets put in by \shortchapentry above.)
-  \dimen0 = 1em
-  \hbox to \dimen0{#1\hss}%
-}
+\def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\labelspace#1}{#4}}
 
 % Unnumbered chapters.
-\def\unnumbchapentry#1#2#3{\dochapentry{#1}{#3}}
-\def\shortunnumberedentry#1#2#3{\tocentry{#1}{\doshortpageno\bgroup#3\egroup}}
+\def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}}
+\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}}
 
 % Sections.
-\def\secentry#1#2#3#4{\dosecentry{#2.#3\labelspace#1}{#4}}
-\def\unnumbsecentry#1#2#3#4{\dosecentry{#1}{#4}}
+\def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}}
+\let\appsecentry=\numsecentry
+\def\unnsecentry#1#2#3#4{\dosecentry{#1}{#4}}
 
 % Subsections.
-\def\subsecentry#1#2#3#4#5{\dosubsecentry{#2.#3.#4\labelspace#1}{#5}}
-\def\unnumbsubsecentry#1#2#3#4#5{\dosubsecentry{#1}{#5}}
+\def\numsubsecentry#1#2#3#4{\dosubsecentry{#2\labelspace#1}{#4}}
+\let\appsubsecentry=\numsubsecentry
+\def\unnsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}}
 
 % And subsubsections.
-\def\subsubsecentry#1#2#3#4#5#6{%
-  \dosubsubsecentry{#2.#3.#4.#5\labelspace#1}{#6}}
-\def\unnumbsubsubsecentry#1#2#3#4#5#6{\dosubsubsecentry{#1}{#6}}
+\def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#2\labelspace#1}{#4}}
+\let\appsubsubsecentry=\numsubsubsecentry
+\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}}
 
 % This parameter controls the indentation of the various levels.
-\newdimen\tocindent \tocindent = 3pc
+% Same as \defaultparindent.
+\newdimen\tocindent \tocindent = 15pt
 
 % Now for the actual typesetting. In all these, #1 is the text and #2 is the
 % page number.
@@ -4400,17 +5356,8 @@ width0pt\relax} \fi
   \tocentry{#1}{\dopageno\bgroup#2\egroup}%
 \endgroup}
 
-% Final typesetting of a toc entry; we use the same \entry macro as for
-% the index entries, but we want to suppress hyphenation here.  (We
-% can't do that in the \entry macro, since index entries might consist
-% of hyphenated-identifiers-that-do-not-fit-on-a-line-and-nothing-else.)
-\def\tocentry#1#2{\begingroup
-  \vskip 0pt plus1pt % allow a little stretch for the sake of nice page breaks
-  % Do not use \turnoffactive in these arguments.  Since the toc is
-  % typeset in cmr, characters such as _ would come out wrong; we
-  % have to do the usual translation tricks.
-  \entry{#1}{#2}%
-\endgroup}
+% We use the same \entry macro as for the index entries.
+\let\tocentry = \entry
 
 % Space between chapter (or whatever) number and the title.
 \def\labelspace{\hskip1em \relax}
@@ -4420,8 +5367,8 @@ width0pt\relax} \fi
 
 \def\chapentryfonts{\secfonts \rm}
 \def\secentryfonts{\textfonts}
-\let\subsecentryfonts = \textfonts
-\let\subsubsecentryfonts = \textfonts
+\def\subsecentryfonts{\textfonts}
+\def\subsubsecentryfonts{\textfonts}
 
 
 \message{environments,}
@@ -4446,12 +5393,12 @@ width0pt\relax} \fi
 {\tentt \global\dimen0 = 3em}% Width of the box.
 \dimen2 = .55pt % Thickness of rules
 % The text. (`r' is open on the right, `e' somewhat less so on the left.)
-\setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt}
+\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
 %
-\global\setbox\errorbox=\hbox to \dimen0{\hfil
+\setbox\errorbox=\hbox to \dimen0{\hfil
    \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
    \advance\hsize by -2\dimen2 % Rules.
-   \vbox{
+   \vbox{%
       \hrule height\dimen2
       \hbox{\vrule width\dimen2 \kern3pt          % Space to left of text.
          \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
@@ -4465,14 +5412,13 @@ width0pt\relax} \fi
 % One exception: @ is still an escape character, so that @end tex works.
 % But \@ or @@ will get a plain tex @ character.
 
-\def\tex{\begingroup
+\envdef\tex{%
   \catcode `\\=0 \catcode `\{=1 \catcode `\}=2
   \catcode `\$=3 \catcode `\&=4 \catcode `\#=6
   \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie
   \catcode `\%=14
   \catcode `\+=\other
   \catcode `\"=\other
-  \catcode `\==\other
   \catcode `\|=\other
   \catcode `\<=\other
   \catcode `\>=\other
@@ -4488,20 +5434,23 @@ width0pt\relax} \fi
   \let\!=\ptexexclam
   \let\i=\ptexi
   \let\indent=\ptexindent
+  \let\noindent=\ptexnoindent
   \let\{=\ptexlbrace
   \let\+=\tabalign
   \let\}=\ptexrbrace
   \let\/=\ptexslash
   \let\*=\ptexstar
   \let\t=\ptext
+  \let\frenchspacing=\plainfrenchspacing
   %
   \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
   \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}%
   \def\@{@}%
-\let\Etex=\endgroup}
+}
+% There is no need to define \Etex.
 
 % Define @lisp ... @end lisp.
-% @lisp does a \begingroup so it can rebind things,
+% @lisp environment forms a group so it can rebind things,
 % including the definition of @end lisp (which normally is erroneous).
 
 % Amount to narrow the margins by for @lisp.
@@ -4512,19 +5461,6 @@ width0pt\relax} \fi
 % have any width.
 \def\lisppar{\null\endgraf}
 
-% Make each space character in the input produce a normal interword
-% space in the output.  Don't allow a line break at this space, as this
-% is used only in environments like @example, where each line of input
-% should produce a line of output anyway.
-%
-{\obeyspaces %
-\gdef\sepspaces{\obeyspaces\let =\tie}}
-
-% Define \obeyedspace to be our active space, whatever it is.  This is
-% for use in \parsearg.
-{\sepspaces%
-\global\let\obeyedspace= }
-
 % This space is always present above and below environments.
 \newskip\envskipamount \envskipamount = 0pt
 
@@ -4534,7 +5470,8 @@ width0pt\relax} \fi
 % start of the next paragraph will insert \parskip.
 %
 \def\aboveenvbreak{{%
-  % =10000 instead of <10000 because of a special case in \itemzzz, q.v.
+  % =10000 instead of <10000 because of a special case in \itemzzz and
+  % \sectionheading, q.v.
   \ifnum \lastpenalty=10000 \else
     \advance\envskipamount by \parskip
     \endgraf
@@ -4542,7 +5479,7 @@ width0pt\relax} \fi
       \removelastskip
       % it's not a good place to break if the last penalty was \nobreak
       % or better ...
-      \ifnum\lastpenalty>10000 \else \penalty-50 \fi
+      \ifnum\lastpenalty<10000 \penalty-50 \fi
       \vskip\envskipamount
     \fi
   \fi
@@ -4550,7 +5487,8 @@ width0pt\relax} \fi
 
 \let\afterenvbreak = \aboveenvbreak
 
-% \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins.
+% \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins; it will
+% also clear it, so that its embedded environments do the narrowing again.
 \let\nonarrowing=\relax
 
 % @cartouche ... @end cartouche: draw rectangle w/rounded corners around
@@ -4574,52 +5512,52 @@ width0pt\relax} \fi
 %
 \newskip\lskip\newskip\rskip
 
-\def\cartouche{%
-\par  % can't be in the midst of a paragraph.
-\begingroup
-        \lskip=\leftskip \rskip=\rightskip
-        \leftskip=0pt\rightskip=0pt %we want these *outside*.
-        \cartinner=\hsize \advance\cartinner by-\lskip
-                          \advance\cartinner by-\rskip
-        \cartouter=\hsize
-        \advance\cartouter by 18.4pt % allow for 3pt kerns on either
-%                                    side, and for 6pt waste from
-%                                    each corner char, and rule thickness
-        \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
-        % Flag to tell @lisp, etc., not to narrow margin.
-        \let\nonarrowing=\comment
-        \vbox\bgroup
-                \baselineskip=0pt\parskip=0pt\lineskip=0pt
-                \carttop
-                \hbox\bgroup
-                        \hskip\lskip
-                        \vrule\kern3pt
-                        \vbox\bgroup
-                                \hsize=\cartinner
-                                \kern3pt
-                                \begingroup
-                                        \baselineskip=\normbskip
-                                        \lineskip=\normlskip
-                                        \parskip=\normpskip
-                                        \vskip -\parskip
+\envdef\cartouche{%
+  \ifhmode\par\fi  % can't be in the midst of a paragraph.
+  \startsavinginserts
+  \lskip=\leftskip \rskip=\rightskip
+  \leftskip=0pt\rightskip=0pt % we want these *outside*.
+  \cartinner=\hsize \advance\cartinner by-\lskip
+  \advance\cartinner by-\rskip
+  \cartouter=\hsize
+  \advance\cartouter by 18.4pt	% allow for 3pt kerns on either
+				% side, and for 6pt waste from
+				% each corner char, and rule thickness
+  \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
+  % Flag to tell @lisp, etc., not to narrow margin.
+  \let\nonarrowing = t%
+  \vbox\bgroup
+      \baselineskip=0pt\parskip=0pt\lineskip=0pt
+      \carttop
+      \hbox\bgroup
+	  \hskip\lskip
+	  \vrule\kern3pt
+	  \vbox\bgroup
+	      \kern3pt
+	      \hsize=\cartinner
+	      \baselineskip=\normbskip
+	      \lineskip=\normlskip
+	      \parskip=\normpskip
+	      \vskip -\parskip
+	      \comment % For explanation, see the end of \def\group.
+}
 \def\Ecartouche{%
-                                \endgroup
-                                \kern3pt
-                        \egroup
-                        \kern3pt\vrule
-                        \hskip\rskip
-                \egroup
-                \cartbot
-        \egroup
-\endgroup
-}}
+              \ifhmode\par\fi
+	      \kern3pt
+	  \egroup
+	  \kern3pt\vrule
+	  \hskip\rskip
+      \egroup
+      \cartbot
+  \egroup
+  \checkinserts
+}
 
 
 % This macro is called at the beginning of all the @example variants,
 % inside a group.
 \def\nonfillstart{%
   \aboveenvbreak
-  \inENV % This group ends at the end of the body
   \hfuzz = 12pt % Don't be fussy
   \sepspaces % Make spaces be word-separators rather than space tokens.
   \let\par = \lisppar % don't ignore blank lines
@@ -4627,116 +5565,139 @@ width0pt\relax} \fi
   \parskip = 0pt
   \parindent = 0pt
   \emergencystretch = 0pt % don't try to avoid overfull boxes
-  % @cartouche defines \nonarrowing to inhibit narrowing
-  % at next level down.
   \ifx\nonarrowing\relax
     \advance \leftskip by \lispnarrowing
     \exdentamount=\lispnarrowing
-    \let\exdent=\nofillexdent
-    \let\nonarrowing=\relax
+  \else
+    \let\nonarrowing = \relax
+  \fi
+  \let\exdent=\nofillexdent
+}
+
+% If you want all examples etc. small: @set dispenvsize small.
+% If you want even small examples the full size: @set dispenvsize nosmall.
+% This affects the following displayed environments:
+%    @example, @display, @format, @lisp
+%
+\def\smallword{small}
+\def\nosmallword{nosmall}
+\let\SETdispenvsize\relax
+\def\setnormaldispenv{%
+  \ifx\SETdispenvsize\smallword
+    % end paragraph for sake of leading, in case document has no blank
+    % line.  This is redundant with what happens in \aboveenvbreak, but
+    % we need to do it before changing the fonts, and it's inconvenient
+    % to change the fonts afterward.
+    \ifnum \lastpenalty=10000 \else \endgraf \fi
+    \smallexamplefonts \rm
+  \fi
+}
+\def\setsmalldispenv{%
+  \ifx\SETdispenvsize\nosmallword
+  \else
+    \ifnum \lastpenalty=10000 \else \endgraf \fi
+    \smallexamplefonts \rm
   \fi
 }
 
-% Define the \E... control sequence only if we are inside the particular
-% environment, so the error checking in \end will work.
-%
-% To end an @example-like environment, we first end the paragraph (via
-% \afterenvbreak's vertical glue), and then the group.  That way we keep
-% the zero \parskip that the environments set -- \parskip glue will be
-% inserted at the beginning of the next paragraph in the document, after
-% the environment.
-%
-\def\nonfillfinish{\afterenvbreak\endgroup}
-
-% @lisp: indented, narrowed, typewriter font.
-\def\lisp{\begingroup
-  \nonfillstart
-  \let\Elisp = \nonfillfinish
-  \tt
-  \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
-  \gobble       % eat return
+% We often define two environments, @foo and @smallfoo.
+% Let's do it by one command:
+\def\makedispenv #1#2{
+  \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}
+  \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}
+  \expandafter\let\csname E#1\endcsname \afterenvbreak
+  \expandafter\let\csname Esmall#1\endcsname \afterenvbreak
 }
 
-% @example: Same as @lisp.
-\def\example{\begingroup \def\Eexample{\nonfillfinish\endgroup}\lisp}
+% Define two synonyms:
+\def\maketwodispenvs #1#2#3{
+  \makedispenv{#1}{#3}
+  \makedispenv{#2}{#3}
+}
 
+% @lisp: indented, narrowed, typewriter font; @example: same as @lisp.
+%
 % @smallexample and @smalllisp: use smaller fonts.
 % Originally contributed by Pavel@xerox.
-\def\smalllisp{\begingroup
-  \def\Esmalllisp{\nonfillfinish\endgroup}%
-  \def\Esmallexample{\nonfillfinish\endgroup}%
-  \smallexamplefonts
-  \lisp
-}
-\let\smallexample = \smalllisp
-
-
-% @display: same as @lisp except keep current font.
 %
-\def\display{\begingroup
+\maketwodispenvs {lisp}{example}{%
   \nonfillstart
-  \let\Edisplay = \nonfillfinish
-  \gobble
+  \tt\quoteexpand
+  \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
+  \gobble       % eat return
 }
+% @display/@smalldisplay: same as @lisp except keep current font.
 %
-% @smalldisplay: @display plus smaller fonts.
-%
-\def\smalldisplay{\begingroup
-  \def\Esmalldisplay{\nonfillfinish\endgroup}%
-  \smallexamplefonts \rm
-  \display
+\makedispenv {display}{%
+  \nonfillstart
+  \gobble
 }
 
-% @format: same as @display except don't narrow margins.
+% @format/@smallformat: same as @display except don't narrow margins.
 %
-\def\format{\begingroup
-  \let\nonarrowing = t
+\makedispenv{format}{%
+  \let\nonarrowing = t%
   \nonfillstart
-  \let\Eformat = \nonfillfinish
   \gobble
 }
-%
-% @smallformat: @format plus smaller fonts.
-%
-\def\smallformat{\begingroup
-  \def\Esmallformat{\nonfillfinish\endgroup}%
-  \smallexamplefonts \rm
-  \format
-}
 
-% @flushleft (same as @format).
-%
-\def\flushleft{\begingroup \def\Eflushleft{\nonfillfinish\endgroup}\format}
+% @flushleft: same as @format, but doesn't obey \SETdispenvsize.
+\envdef\flushleft{%
+  \let\nonarrowing = t%
+  \nonfillstart
+  \gobble
+}
+\let\Eflushleft = \afterenvbreak
 
 % @flushright.
 %
-\def\flushright{\begingroup
-  \let\nonarrowing = t
+\envdef\flushright{%
+  \let\nonarrowing = t%
   \nonfillstart
-  \let\Eflushright = \nonfillfinish
   \advance\leftskip by 0pt plus 1fill
   \gobble
 }
+\let\Eflushright = \afterenvbreak
 
 
 % @quotation does normal linebreaking (hence we can't use \nonfillstart)
-% and narrows the margins.
+% and narrows the margins.  We keep \parskip nonzero in general, since
+% we're doing normal filling.  So, when using \aboveenvbreak and
+% \afterenvbreak, temporarily make \parskip 0.
 %
-\def\quotation{%
-  \begingroup\inENV %This group ends at the end of the @quotation body
+\envdef\quotation{%
   {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
   \parindent=0pt
-  % We have retained a nonzero parskip for the environment, since we're
-  % doing normal filling. So to avoid extra space below the environment...
-  \def\Equotation{\parskip = 0pt \nonfillfinish}%
   %
   % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
   \ifx\nonarrowing\relax
     \advance\leftskip by \lispnarrowing
     \advance\rightskip by \lispnarrowing
     \exdentamount = \lispnarrowing
+  \else
     \let\nonarrowing = \relax
   \fi
+  \parsearg\quotationlabel
+}
+
+% We have retained a nonzero parskip for the environment, since we're
+% doing normal filling.
+%
+\def\Equotation{%
+  \par
+  \ifx\quotationauthor\undefined\else
+    % indent a bit.
+    \leftline{\kern 2\leftskip \sl ---\quotationauthor}%
+  \fi
+  {\parskip=0pt \afterenvbreak}%
+}
+
+% If we're given an argument, typeset it in bold with a colon after.
+\def\quotationlabel#1{%
+  \def\temp{#1}%
+  \ifx\temp\empty \else
+    {\bf #1: }%
+  \fi
 }
 
 
@@ -4758,7 +5719,7 @@ width0pt\relax} \fi
 %
 % [Knuth] p. 380
 \def\uncatcodespecials{%
-  \def\do##1{\catcode`##1=12}\dospecials}
+  \def\do##1{\catcode`##1=\other}\dospecials}
 %
 % [Knuth] pp. 380,381,391
 % Disable Spanish ligatures ?` and !` of \tt font
@@ -4792,6 +5753,34 @@ width0pt\relax} \fi
 \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
 %
 \def\starttabbox{\setbox0=\hbox\bgroup}
+
+% Allow an option to not replace quotes with a regular directed right
+% quote/apostrophe (char 0x27), but instead use the undirected quote
+% from cmtt (char 0x0d).  The undirected quote is ugly, so don't make it
+% the default, but it works for pasting with more pdf viewers (at least
+% evince), the lilypond developers report.  xpdf does work with the
+% regular 0x27.  
+% 
+\def\codequoteright{%
+  \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
+    '%
+  \else
+    \char'15
+  \fi
+}
+%
+% and a similar option for the left quote char vs. a grave accent.
+% Modern fonts display ASCII 0x60 as a grave accent, so some people like
+% the code environments to do likewise.
+% 
+\def\codequoteleft{%
+  \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
+    `%
+  \else
+    \char'22
+  \fi
+}
+%
 \begingroup
   \catcode`\^^I=\active
   \gdef\tabexpand{%
@@ -4804,13 +5793,25 @@ width0pt\relax} \fi
       \wd0=\dimen0 \box0 \starttabbox
     }%
   }
+  \catcode`\'=\active
+  \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}%
+  %
+  \catcode`\`=\active
+  \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}%
+  %
+  \gdef\quoteexpand{\rquoteexpand \lquoteexpand}%
 \endgroup
+
+% start the verbatim environment.
 \def\setupverbatim{%
+  \let\nonarrowing = t%
+  \nonfillstart
   % Easiest (and conventionally used) font for verbatim
   \tt
   \def\par{\leavevmode\egroup\box0\endgraf}%
   \catcode`\`=\active
   \tabexpand
+  \quoteexpand
   % Respect line breaks,
   % print special symbols as themselves, and
   % make each space count
@@ -4827,7 +5828,7 @@ width0pt\relax} \fi
 %
 % [Knuth] p. 382; only eat outer {}
 \begingroup
-  \catcode`[=1\catcode`]=2\catcode`\{=12\catcode`\}=12
+  \catcode`[=1\catcode`]=2\catcode`\{=\other\catcode`\}=\other
   \gdef\doverb{#1[\def\next##1#1}[##1\endgroup]\next]
 \endgroup
 %
@@ -4844,13 +5845,6 @@ width0pt\relax} \fi
 % we need not redefine '\', '{' and '}'.
 %
 % Inspired by LaTeX's verbatim command set [latex.ltx]
-%% Include LaTeX hack for completeness -- never know
-%% \begingroup
-%% \catcode`|=0 \catcode`[=1
-%% \catcode`]=2\catcode`\{=12\catcode`\}=12\catcode`\ =\active
-%% \catcode`\\=12|gdef|doverbatim#1@end verbatim[
-%% #1|endgroup|def|Everbatim[]|end[verbatim]]
-%% |endgroup
 %
 \begingroup
   \catcode`\ =\active
@@ -4858,54 +5852,32 @@ width0pt\relax} \fi
   % ignore everything up to the first ^^M, that's the newline at the end
   % of the @verbatim input line itself.  Otherwise we get an extra blank
   % line in the output.
-  \gdef\doverbatim#1^^M#2@end verbatim{#2\end{verbatim}}%
+  \xdef\doverbatim#1^^M#2@end verbatim{#2\noexpand\end\gobble verbatim}%
+  % We really want {...\end verbatim} in the body of the macro, but
+  % without the active space; thus we have to use \xdef and \gobble.
 \endgroup
 %
-\def\verbatim{%
-  \def\Everbatim{\nonfillfinish\endgroup}%
-  \begingroup
-    \nonfillstart
-    \advance\leftskip by -\defbodyindent
-    \begingroup\setupverbatim\doverbatim
+\envdef\verbatim{%
+    \setupverbatim\doverbatim
 }
+\let\Everbatim = \afterenvbreak
+
 
 % @verbatiminclude FILE - insert text of file in verbatim environment.
 %
-% Allow normal characters that we make active in the argument (a file name).
-\def\verbatiminclude{%
-  \begingroup
-    \catcode`\\=\other
-    \catcode`~=\other
-    \catcode`^=\other
-    \catcode`_=\other
-    \catcode`|=\other
-    \catcode`<=\other
-    \catcode`>=\other
-    \catcode`+=\other
-    \parsearg\doverbatiminclude
-}
-\def\setupverbatiminclude{%
-  \begingroup
-    \nonfillstart
-    \advance\leftskip by -\defbodyindent
-    \begingroup\setupverbatim
-}
+\def\verbatiminclude{\parseargusing\filenamecatcodes\doverbatiminclude}
 %
 \def\doverbatiminclude#1{%
-     % Restore active chars for included file.
-  \endgroup
-  \begingroup
-    \let\value=\expandablevalue
-    \def\thisfile{#1}%
-    \expandafter\expandafter\setupverbatiminclude\input\thisfile
-  \endgroup
-  \nonfillfinish
-  \endgroup
+  {%
+    \makevalueexpandable
+    \setupverbatim
+    \input #1
+    \afterenvbreak
+  }%
 }
 
 % @copying ... @end copying.
-% Save the text away for @insertcopying later.  Many commands won't be
-% allowed in this context, but that's ok.
+% Save the text away for @insertcopying later.
 %
 % We save the uninterpreted tokens, rather than creating a box.
 % Saving the text in a box would be much easier, but then all the
@@ -4914,641 +5886,357 @@ width0pt\relax} \fi
 % file; b) letting users define the frontmatter in as flexible order as
 % possible is very desirable.
 %
-\def\copying{\begingroup
-  % Define a command to swallow text until we reach `@end copying'.
-  % \ is the escape char in this texinfo.tex file, so it is the
-  % delimiter for the command; @ will be the escape char when we read
-  % it, but that doesn't matter.
-  \long\def\docopying##1\end copying{\gdef\copyingtext{##1}\enddocopying}%
-  %
-  % We must preserve ^^M's in the input file; see \insertcopying below.
-  \catcode`\^^M = \active
-  \docopying
-}
-
-% What we do to finish off the copying text.
-%
-\def\enddocopying{\endgroup\ignorespaces}
-
-% @insertcopying.  Here we must play games with ^^M's.  On the one hand,
-% we need them to delimit commands such as `@end quotation', so they
-% must be active.  On the other hand, we certainly don't want every
-% end-of-line to be a \par, as would happen with the normal active
-% definition of ^^M.  On the third hand, two ^^M's in a row should still
-% generate a \par.
-%
-% Our approach is to make ^^M insert a space and a penalty1 normally;
-% then it can also check if \lastpenalty=1.  If it does, then manually
-% do \par.
-%
-% This messes up the normal definitions of @c[omment], so we redefine
-% it.  Similarly for @ignore.  (These commands are used in the gcc
-% manual for man page generation.)
-%
-% Seems pretty fragile, most line-oriented commands will presumably
-% fail, but for the limited use of getting the copying text (which
-% should be quite simple) inserted, we can hope it's ok.
-%
-{\catcode`\^^M=\active %
-\gdef\insertcopying{\begingroup %
-  \parindent = 0pt  % looks wrong on title page
-  \def^^M{%
-    \ifnum \lastpenalty=1 %
-      \par %
-    \else %
-      \space \penalty 1 %
-    \fi %
-  }%
-  %
-  % Fix @c[omment] for catcode 13 ^^M's.
-  \def\c##1^^M{\ignorespaces}%
-  \let\comment = \c %
-  %
-  % Don't bother jumping through all the hoops that \doignore does, it
-  % would be very hard since the catcodes are already set.
-  \long\def\ignore##1\end ignore{\ignorespaces}%
-  %
-  \copyingtext %
-\endgroup}%
+\def\copying{\checkenv{}\begingroup\scanargctxt\docopying}
+\def\docopying#1@end copying{\endgroup\def\copyingtext{#1}}
+%
+\def\insertcopying{%
+  \begingroup
+    \parindent = 0pt  % paragraph indentation looks wrong on title page
+    \scanexp\copyingtext
+  \endgroup
 }
 
+
 \message{defuns,}
 % @defun etc.
 
-% Allow user to change definition object font (\df) internally
-\def\setdeffont#1 {\csname DEF#1\endcsname}
-
 \newskip\defbodyindent \defbodyindent=.4in
 \newskip\defargsindent \defargsindent=50pt
 \newskip\deflastargmargin \deflastargmargin=18pt
-
-\newcount\parencount
-
-% We want ()&[] to print specially on the defun line.
-%
-\def\activeparens{%
-  \catcode`\(=\active \catcode`\)=\active
-  \catcode`\&=\active
-  \catcode`\[=\active \catcode`\]=\active
-}
-
-% Make control sequences which act like normal parenthesis chars.
-\let\lparen = ( \let\rparen = )
-
-{\activeparens % Now, smart parens don't turn on until &foo (see \amprm)
-
-% Be sure that we always have a definition for `(', etc.  For example,
-% if the fn name has parens in it, \boldbrax will not be in effect yet,
-% so TeX would otherwise complain about undefined control sequence.
-\global\let(=\lparen \global\let)=\rparen
-\global\let[=\lbrack \global\let]=\rbrack
-
-\gdef\functionparens{\boldbrax\let&=\amprm\parencount=0 }
-\gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
-% This is used to turn on special parens
-% but make & act ordinary (given that it's active).
-\gdef\boldbraxnoamp{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb\let&=\ampnr}
-
-% Definitions of (, ) and & used in args for functions.
-% This is the definition of ( outside of all parentheses.
-\gdef\oprm#1 {{\rm\char`\(}#1 \bf \let(=\opnested
-  \global\advance\parencount by 1
-}
-%
-% This is the definition of ( when already inside a level of parens.
-\gdef\opnested{\char`\(\global\advance\parencount by 1 }
-%
-\gdef\clrm{% Print a paren in roman if it is taking us back to depth of 0.
-  % also in that case restore the outer-level definition of (.
-  \ifnum \parencount=1 {\rm \char `\)}\sl \let(=\oprm \else \char `\) \fi
-  \global\advance \parencount by -1 }
-% If we encounter &foo, then turn on ()-hacking afterwards
-\gdef\amprm#1 {{\rm\&#1}\let(=\oprm \let)=\clrm\ }
-%
-\gdef\normalparens{\boldbrax\let&=\ampnr}
-} % End of definition inside \activeparens
-%% These parens (in \boldbrax) actually are a little bolder than the
-%% contained text.  This is especially needed for [ and ]
-\def\opnr{{\sf\char`\(}\global\advance\parencount by 1 }
-\def\clnr{{\sf\char`\)}\global\advance\parencount by -1 }
-\let\ampnr = \&
-\def\lbrb{{\bf\char`\[}}
-\def\rbrb{{\bf\char`\]}}
-
-% Active &'s sneak into the index arguments, so make sure it's defined.
-{
-  \catcode`& = \active
-  \global\let& = \ampnr
-}
-
-% \defname, which formats the name of the @def (not the args).
-% #1 is the function name.
-% #2 is the type of definition, such as "Function".
-%
-\def\defname#1#2{%
-  % How we'll output the type name.  Putting it in brackets helps
-  % distinguish it from the body text that may end up on the next line
-  % just below it.
-  \ifempty{#2}%
-    \def\defnametype{}%
+\newcount\defunpenalty
+
+% Start the processing of @deffn:
+\def\startdefun{%
+  \ifnum\lastpenalty<10000
+    \medbreak
+    \defunpenalty=10003 % Will keep this @deffn together with the
+                        % following @def command, see below.
   \else
-    \def\defnametype{[\rm #2]}%
+    % If there are two @def commands in a row, we'll have a \nobreak,
+    % which is there to keep the function description together with its
+    % header.  But if there's nothing but headers, we need to allow a
+    % break somewhere.  Check specifically for penalty 10002, inserted
+    % by \printdefunline, instead of 10000, since the sectioning
+    % commands also insert a nobreak penalty, and we don't want to allow
+    % a break between a section heading and a defun.
+    %
+    % As a minor refinement, we avoid "club" headers by signalling
+    % with penalty of 10003 after the very first @deffn in the
+    % sequence (see above), and penalty of 10002 after any following
+    % @def command.
+    \ifnum\lastpenalty=10002 \penalty2000 \else \defunpenalty=10002 \fi
+    %
+    % Similarly, after a section heading, do not allow a break.
+    % But do insert the glue.
+    \medskip  % preceded by discardable penalty, so not a breakpoint
   \fi
   %
-  % Get the values of \leftskip and \rightskip as they were outside the @def...
-  \dimen2=\leftskip
-  \advance\dimen2 by -\defbodyindent
-  %
-  % Figure out values for the paragraph shape.
-  \setbox0=\hbox{\hskip \deflastargmargin{\defnametype}}%
-  \dimen0=\hsize \advance \dimen0 by -\wd0  % compute size for first line
-  \dimen1=\hsize \advance \dimen1 by -\defargsindent  % size for continuations
-  \parshape 2 0in \dimen0 \defargsindent \dimen1
-  %
-  % Output arg 2 ("Function" or some such) but stuck inside a box of
-  % width 0 so it does not interfere with linebreaking.
-  \noindent
-  %
-  {% Adjust \hsize to exclude the ambient margins,
-   % so that \rightline will obey them.
-   \advance \hsize by -\dimen2
-   \dimen3 = 0pt  % was -1.25pc
-   \rlap{\rightline{\defnametype\kern\dimen3}}%
-  }%
-  %
-  % Allow all lines to be underfull without complaint:
-  \tolerance=10000 \hbadness=10000
-  \advance\leftskip by -\defbodyindent
-  \exdentamount=\defbodyindent
-  {\df #1}\enskip        % output function name
-  % \defunargs will be called next to output the arguments, if any.
-}
-
-% Common pieces to start any @def...
-% #1 is the \E... control sequence to end the definition (which we define).
-% #2 is the \...x control sequence (which our caller defines).
-% #3 is the control sequence to process the header, such as \defunheader.
-%
-\def\parsebodycommon#1#2#3{%
-  \begingroup\inENV
-  % If there are two @def commands in a row, we'll have a \nobreak,
-  % which is there to keep the function description together with its
-  % header.  But if there's nothing but headers, we want to allow a
-  % break after all.  Check for penalty 10002 (inserted by
-  % \defargscommonending) instead of 10000, since the sectioning
-  % commands insert a \penalty10000, and we don't want to allow a break
-  % between a section heading and a defun.
-  \ifnum\lastpenalty=10002 \penalty0 \fi
-  \medbreak
-  %
-  % Define the \E... end token that this defining construct specifies
-  % so that it will exit this group.
-  \def#1{\endgraf\endgroup\medbreak}%
-  %
   \parindent=0in
   \advance\leftskip by \defbodyindent
   \exdentamount=\defbodyindent
 }
 
-% Common part of the \...x definitions.
-%
-\def\defxbodycommon{%
-  % As with \parsebodycommon above, allow line break if we have multiple
-  % x headers in a row.  It's not a great place, though.
-  \ifnum\lastpenalty=10000 \penalty1000 \fi
+\def\dodefunx#1{%
+  % First, check whether we are in the right environment:
+  \checkenv#1%
   %
-  \begingroup\obeylines
+  % As above, allow line break if we have multiple x headers in a row.
+  % It's not a great place, though.
+  \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi
+  %
+  % And now, it's time to reuse the body of the original defun:
+  \expandafter\gobbledefun#1%
 }
+\def\gobbledefun#1\startdefun{}
 
-% Process body of @defun, @deffn, @defmac, etc.
+% \printdefunline \deffnheader{text}
 %
-\def\defparsebody#1#2#3{%
-  \parsebodycommon{#1}{#2}{#3}%
-  \def#2{\defxbodycommon \activeparens \spacesplit#3}%
-  \catcode\equalChar=\active
-  \begingroup\obeylines\activeparens
-  \spacesplit#3%
+\def\printdefunline#1#2{%
+  \begingroup
+    % call \deffnheader:
+    #1#2 \endheader
+    % common ending:
+    \interlinepenalty = 10000
+    \advance\rightskip by 0pt plus 1fil
+    \endgraf
+    \nobreak\vskip -\parskip
+    \penalty\defunpenalty  % signal to \startdefun and \dodefunx
+    % Some of the @defun-type tags do not enable magic parentheses,
+    % rendering the following check redundant.  But we don't optimize.
+    \checkparencounts
+  \endgroup
 }
 
-% #1, #2, #3 are the common arguments (see \parsebodycommon above).
-% #4, delimited by the space, is the class name.
-%
-\def\defmethparsebody#1#2#3#4 {%
-  \parsebodycommon{#1}{#2}{#3}%
-  \def#2##1 {\defxbodycommon \activeparens \spacesplit{#3{##1}}}%
-  \begingroup\obeylines\activeparens
-  % The \empty here prevents misinterpretation of a construct such as
-  %   @deffn {whatever} {Enharmonic comma}
-  % See comments at \deftpparsebody, although in our case we don't have
-  % to remove the \empty afterwards, since it is empty.
-  \spacesplit{#3{#4}}\empty
-}
+\def\Edefun{\endgraf\medbreak}
 
-% Used for @deftypemethod and @deftypeivar.
-% #1, #2, #3 are the common arguments (see \defparsebody).
-% #4, delimited by a space, is the class name.
-% #5 is the method's return type.
+% \makedefun{deffn} creates \deffn, \deffnx and \Edeffn;
+% the only thing remainnig is to define \deffnheader.
 %
-\def\deftypemethparsebody#1#2#3#4 #5 {%
-  \parsebodycommon{#1}{#2}{#3}%
-  \def#2##1 ##2 {\defxbodycommon \activeparens \spacesplit{#3{##1}{##2}}}%
-  \begingroup\obeylines\activeparens
-  \spacesplit{#3{#4}{#5}}%
+\def\makedefun#1{%
+  \expandafter\let\csname E#1\endcsname = \Edefun
+  \edef\temp{\noexpand\domakedefun
+    \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}%
+  \temp
 }
 
-% Used for @deftypeop.  The change from \deftypemethparsebody is an
-% extra argument at the beginning which is the `category', instead of it
-% being the hardwired string `Method' or `Instance Variable'.  We have
-% to account for this both in the \...x definition and in parsing the
-% input at hand.  Thus also need a control sequence (passed as #5) for
-% the \E... definition to assign the category name to.
+% \domakedefun \deffn \deffnx \deffnheader
 %
-\def\deftypeopparsebody#1#2#3#4#5 #6 {%
-  \parsebodycommon{#1}{#2}{#3}%
-  \def#2##1 ##2 ##3 {\def#4{##1}%
-    \defxbodycommon \activeparens \spacesplit{#3{##2}{##3}}}%
-  \begingroup\obeylines\activeparens
-  \spacesplit{#3{#5}{#6}}%
-}
-
-% For @defop.
-\def\defopparsebody #1#2#3#4#5 {%
-  \parsebodycommon{#1}{#2}{#3}%
-  \def#2##1 ##2 {\def#4{##1}%
-    \defxbodycommon \activeparens \spacesplit{#3{##2}}}%
-  \begingroup\obeylines\activeparens
-  \spacesplit{#3{#5}}%
-}
-
-% These parsing functions are similar to the preceding ones
-% except that they do not make parens into active characters.
-% These are used for "variables" since they have no arguments.
+% Define \deffn and \deffnx, without parameters.
+% \deffnheader has to be defined explicitly.
 %
-\def\defvarparsebody #1#2#3{%
-  \parsebodycommon{#1}{#2}{#3}%
-  \def#2{\defxbodycommon \spacesplit#3}%
-  \catcode\equalChar=\active
-  \begingroup\obeylines
-  \spacesplit#3%
-}
-
-% @defopvar.
-\def\defopvarparsebody #1#2#3#4#5 {%
-  \parsebodycommon{#1}{#2}{#3}%
-  \def#2##1 ##2 {\def#4{##1}%
-    \defxbodycommon \spacesplit{#3{##2}}}%
-  \begingroup\obeylines
-  \spacesplit{#3{#5}}%
-}
-
-\def\defvrparsebody#1#2#3#4 {%
-  \parsebodycommon{#1}{#2}{#3}%
-  \def#2##1 {\defxbodycommon \spacesplit{#3{##1}}}%
-  \begingroup\obeylines
-  \spacesplit{#3{#4}}%
+\def\domakedefun#1#2#3{%
+  \envdef#1{%
+    \startdefun
+    \parseargusing\activeparens{\printdefunline#3}%
+  }%
+  \def#2{\dodefunx#1}%
+  \def#3%
 }
 
-% This loses on `@deftp {Data Type} {struct termios}' -- it thinks the
-% type is just `struct', because we lose the braces in `{struct
-% termios}' when \spacesplit reads its undelimited argument.  Sigh.
-% \let\deftpparsebody=\defvrparsebody
-%
-% So, to get around this, we put \empty in with the type name.  That
-% way, TeX won't find exactly `{...}' as an undelimited argument, and
-% won't strip off the braces.
-%
-\def\deftpparsebody #1#2#3#4 {%
-  \parsebodycommon{#1}{#2}{#3}%
-  \def#2##1 {\defxbodycommon \spacesplit{#3{##1}}}%
-  \begingroup\obeylines
-  \spacesplit{\parsetpheaderline{#3{#4}}}\empty
-}
-
-% Fine, but then we have to eventually remove the \empty *and* the
-% braces (if any).  That's what this does.
-%
-\def\removeemptybraces\empty#1\relax{#1}
+%%% Untyped functions:
 
-% After \spacesplit has done its work, this is called -- #1 is the final
-% thing to call, #2 the type name (which starts with \empty), and #3
-% (which might be empty) the arguments.
-%
-\def\parsetpheaderline#1#2#3{%
-  #1{\removeemptybraces#2\relax}{#3}%
-}%
-
-% Split up #2 (the rest of the input line) at the first space token.
-% call #1 with two arguments:
-%  the first is all of #2 before the space token,
-%  the second is all of #2 after that space token.
-% If #2 contains no space token, all of it is passed as the first arg
-% and the second is passed as empty.
-%
-{\obeylines %
- \gdef\spacesplit#1#2^^M{\endgroup\spacesplitx{#1}#2 \relax\spacesplitx}%
- \long\gdef\spacesplitx#1#2 #3#4\spacesplitx{%
-   \ifx\relax #3%
-     #1{#2}{}%
-   \else %
-     #1{#2}{#3#4}%
-   \fi}%
-}
+% @deffn category name args
+\makedefun{deffn}{\deffngeneral{}}
 
-% Define @defun.
+% @deffn category class name args
+\makedefun{defop}#1 {\defopon{#1\ \putwordon}}
 
-% This is called to end the arguments processing for all the @def... commands.
-%
-\def\defargscommonending{%
-  \interlinepenalty = 10000
-  \advance\rightskip by 0pt plus 1fil
-  \endgraf
-  \nobreak\vskip -\parskip
-  \penalty 10002  % signal to \parsebodycommon.
-}
+% \defopon {category on}class name args
+\def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
 
-% This expands the args and terminates the paragraph they comprise.
+% \deffngeneral {subind}category name args
 %
-\def\defunargs#1{\functionparens \sl
-% Expand, preventing hyphenation at `-' chars.
-% Note that groups don't affect changes in \hyphenchar.
-% Set the font temporarily and use \font in case \setfont made \tensl a macro.
-{\tensl\hyphenchar\font=0}%
-#1%
-{\tensl\hyphenchar\font=45}%
-\ifnum\parencount=0 \else \errmessage{Unbalanced parentheses in @def}\fi%
-  \defargscommonending
+\def\deffngeneral#1#2 #3 #4\endheader{%
+  % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}.
+  \dosubind{fn}{\code{#3}}{#1}%
+  \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
 }
 
-\def\deftypefunargs #1{%
-% Expand, preventing hyphenation at `-' chars.
-% Note that groups don't affect changes in \hyphenchar.
-% Use \boldbraxnoamp, not \functionparens, so that & is not special.
-\boldbraxnoamp
-\tclose{#1}% avoid \code because of side effects on active chars
-  \defargscommonending
-}
+%%% Typed functions:
 
-% Do complete processing of one @defun or @defunx line already parsed.
+% @deftypefn category type name args
+\makedefun{deftypefn}{\deftypefngeneral{}}
 
-% @deffn Command forward-char nchars
+% @deftypeop category class type name args
+\makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}}
 
-\def\deffn{\defmethparsebody\Edeffn\deffnx\deffnheader}
+% \deftypeopon {category on}class type name args
+\def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
 
-\def\deffnheader #1#2#3{\doind {fn}{\code{#2}}%
-\begingroup\defname {#2}{#1}\defunargs{#3}\endgroup %
-\catcode\equalChar=\other % Turn off change made in \defparsebody
+% \deftypefngeneral {subind}category type name args
+%
+\def\deftypefngeneral#1#2 #3 #4 #5\endheader{%
+  \dosubind{fn}{\code{#4}}{#1}%
+  \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
 }
 
-% @defun == @deffn Function
+%%% Typed variables:
 
-\def\defun{\defparsebody\Edefun\defunx\defunheader}
+% @deftypevr category type var args
+\makedefun{deftypevr}{\deftypecvgeneral{}}
 
-\def\defunheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
-\begingroup\defname {#1}{\putwordDeffunc}%
-\defunargs {#2}\endgroup %
-\catcode\equalChar=\other % Turn off change made in \defparsebody
-}
+% @deftypecv category class type var args
+\makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}}
 
-% @deftypefun int foobar (int @var{foo}, float @var{bar})
+% \deftypecvof {category of}class type var args
+\def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} }
 
-\def\deftypefun{\defparsebody\Edeftypefun\deftypefunx\deftypefunheader}
-
-% #1 is the data type.  #2 is the name and args.
-\def\deftypefunheader #1#2{\deftypefunheaderx{#1}#2 \relax}
-% #1 is the data type, #2 the name, #3 the args.
-\def\deftypefunheaderx #1#2 #3\relax{%
-\doind {fn}{\code{#2}}% Make entry in function index
-\begingroup\defname {\defheaderxcond#1\relax$.$#2}{\putwordDeftypefun}%
-\deftypefunargs {#3}\endgroup %
-\catcode\equalChar=\other % Turn off change made in \defparsebody
+% \deftypecvgeneral {subind}category type var args
+%
+\def\deftypecvgeneral#1#2 #3 #4 #5\endheader{%
+  \dosubind{vr}{\code{#4}}{#1}%
+  \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
 }
 
-% @deftypefn {Library Function} int foobar (int @var{foo}, float @var{bar})
-
-\def\deftypefn{\defmethparsebody\Edeftypefn\deftypefnx\deftypefnheader}
+%%% Untyped variables:
 
-% \defheaderxcond#1\relax$.$
-% puts #1 in @code, followed by a space, but does nothing if #1 is null.
-\def\defheaderxcond#1#2$.${\ifx#1\relax\else\code{#1#2} \fi}
-
-% #1 is the classification.  #2 is the data type.  #3 is the name and args.
-\def\deftypefnheader #1#2#3{\deftypefnheaderx{#1}{#2}#3 \relax}
-% #1 is the classification, #2 the data type, #3 the name, #4 the args.
-\def\deftypefnheaderx #1#2#3 #4\relax{%
-\doind {fn}{\code{#3}}% Make entry in function index
-\begingroup
-\normalparens % notably, turn off `&' magic, which prevents
-%               at least some C++ text from working
-\defname {\defheaderxcond#2\relax$.$#3}{#1}%
-\deftypefunargs {#4}\endgroup %
-\catcode\equalChar=\other % Turn off change made in \defparsebody
-}
+% @defvr category var args
+\makedefun{defvr}#1 {\deftypevrheader{#1} {} }
 
-% @defmac == @deffn Macro
+% @defcv category class var args
+\makedefun{defcv}#1 {\defcvof{#1\ \putwordof}}
 
-\def\defmac{\defparsebody\Edefmac\defmacx\defmacheader}
+% \defcvof {category of}class var args
+\def\defcvof#1#2 {\deftypecvof{#1}#2 {} }
 
-\def\defmacheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
-\begingroup\defname {#1}{\putwordDefmac}%
-\defunargs {#2}\endgroup %
-\catcode\equalChar=\other % Turn off change made in \defparsebody
+%%% Type:
+% @deftp category name args
+\makedefun{deftp}#1 #2 #3\endheader{%
+  \doind{tp}{\code{#2}}%
+  \defname{#1}{}{#2}\defunargs{#3\unskip}%
 }
 
-% @defspec == @deffn Special Form
-
-\def\defspec{\defparsebody\Edefspec\defspecx\defspecheader}
-
-\def\defspecheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
-\begingroup\defname {#1}{\putwordDefspec}%
-\defunargs {#2}\endgroup %
-\catcode\equalChar=\other % Turn off change made in \defparsebody
-}
+% Remaining @defun-like shortcuts:
+\makedefun{defun}{\deffnheader{\putwordDeffunc} }
+\makedefun{defmac}{\deffnheader{\putwordDefmac} }
+\makedefun{defspec}{\deffnheader{\putwordDefspec} }
+\makedefun{deftypefun}{\deftypefnheader{\putwordDeffunc} }
+\makedefun{defvar}{\defvrheader{\putwordDefvar} }
+\makedefun{defopt}{\defvrheader{\putwordDefopt} }
+\makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} }
+\makedefun{defmethod}{\defopon\putwordMethodon}
+\makedefun{deftypemethod}{\deftypeopon\putwordMethodon}
+\makedefun{defivar}{\defcvof\putwordInstanceVariableof}
+\makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof}
 
-% @defop CATEGORY CLASS OPERATION ARG...
+% \defname, which formats the name of the @def (not the args).
+% #1 is the category, such as "Function".
+% #2 is the return type, if any.
+% #3 is the function name.
 %
-\def\defop #1 {\def\defoptype{#1}%
-\defopparsebody\Edefop\defopx\defopheader\defoptype}
+% We are followed by (but not passed) the arguments, if any.
 %
-\def\defopheader#1#2#3{%
-  \dosubind{fn}{\code{#2}}{\putwordon\ \code{#1}}% function index entry
-  \begingroup
-    \defname{#2}{\defoptype\ \putwordon\ #1}%
-    \defunargs{#3}%
-  \endgroup
+\def\defname#1#2#3{%
+  % Get the values of \leftskip and \rightskip as they were outside the @def...
+  \advance\leftskip by -\defbodyindent
+  %
+  % How we'll format the type name.  Putting it in brackets helps
+  % distinguish it from the body text that may end up on the next line
+  % just below it.
+  \def\temp{#1}%
+  \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else [\rm\temp]\fi}
+  %
+  % Figure out line sizes for the paragraph shape.
+  % The first line needs space for \box0; but if \rightskip is nonzero,
+  % we need only space for the part of \box0 which exceeds it:
+  \dimen0=\hsize  \advance\dimen0 by -\wd0  \advance\dimen0 by \rightskip
+  % The continuations:
+  \dimen2=\hsize  \advance\dimen2 by -\defargsindent
+  % (plain.tex says that \dimen1 should be used only as global.)
+  \parshape 2 0in \dimen0 \defargsindent \dimen2
+  %
+  % Put the type name to the right margin.
+  \noindent
+  \hbox to 0pt{%
+    \hfil\box0 \kern-\hsize
+    % \hsize has to be shortened this way:
+    \kern\leftskip
+    % Intentionally do not respect \rightskip, since we need the space.
+  }%
+  %
+  % Allow all lines to be underfull without complaint:
+  \tolerance=10000 \hbadness=10000
+  \exdentamount=\defbodyindent
+  {%
+    % defun fonts. We use typewriter by default (used to be bold) because:
+    % . we're printing identifiers, they should be in tt in principle.
+    % . in languages with many accents, such as Czech or French, it's
+    %   common to leave accents off identifiers.  The result looks ok in
+    %   tt, but exceedingly strange in rm.
+    % . we don't want -- and --- to be treated as ligatures.
+    % . this still does not fix the ?` and !` ligatures, but so far no
+    %   one has made identifiers using them :).
+    \df \tt
+    \def\temp{#2}% return value type
+    \ifx\temp\empty\else \tclose{\temp} \fi
+    #3% output function name
+  }%
+  {\rm\enskip}% hskip 0.5 em of \tenrm
+  %
+  \boldbrax
+  % arguments will be output next, if any.
 }
 
-% @deftypeop CATEGORY CLASS TYPE OPERATION ARG...
+% Print arguments in slanted roman (not ttsl), inconsistently with using
+% tt for the name.  This is because literal text is sometimes needed in
+% the argument list (groff manual), and ttsl and tt are not very
+% distinguishable.  Prevent hyphenation at `-' chars.
 %
-\def\deftypeop #1 {\def\deftypeopcategory{#1}%
-  \deftypeopparsebody\Edeftypeop\deftypeopx\deftypeopheader
-                       \deftypeopcategory}
-%
-% #1 is the class name, #2 the data type, #3 the operation name, #4 the args.
-\def\deftypeopheader#1#2#3#4{%
-  \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index
-  \begingroup
-    \defname{\defheaderxcond#2\relax$.$#3}
-            {\deftypeopcategory\ \putwordon\ \code{#1}}%
-    \deftypefunargs{#4}%
-  \endgroup
+\def\defunargs#1{%
+  % use sl by default (not ttsl),
+  % tt for the names.
+  \df \sl \hyphenchar\font=0
+  %
+  % On the other hand, if an argument has two dashes (for instance), we
+  % want a way to get ttsl.  Let's try @var for that.
+  \let\var=\ttslanted
+  #1%
+  \sl\hyphenchar\font=45
 }
 
-% @deftypemethod CLASS TYPE METHOD ARG...
-%
-\def\deftypemethod{%
-  \deftypemethparsebody\Edeftypemethod\deftypemethodx\deftypemethodheader}
+% We want ()&[] to print specially on the defun line.
 %
-% #1 is the class name, #2 the data type, #3 the method name, #4 the args.
-\def\deftypemethodheader#1#2#3#4{%
-  \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index
-  \begingroup
-    \defname{\defheaderxcond#2\relax$.$#3}{\putwordMethodon\ \code{#1}}%
-    \deftypefunargs{#4}%
-  \endgroup
+\def\activeparens{%
+  \catcode`\(=\active \catcode`\)=\active
+  \catcode`\[=\active \catcode`\]=\active
+  \catcode`\&=\active
 }
 
-% @deftypeivar CLASS TYPE VARNAME
-%
-\def\deftypeivar{%
-  \deftypemethparsebody\Edeftypeivar\deftypeivarx\deftypeivarheader}
-%
-% #1 is the class name, #2 the data type, #3 the variable name.
-\def\deftypeivarheader#1#2#3{%
-  \dosubind{vr}{\code{#3}}{\putwordof\ \code{#1}}% entry in variable index
-  \begingroup
-    \defname{\defheaderxcond#2\relax$.$#3}
-            {\putwordInstanceVariableof\ \code{#1}}%
-    \defvarargs{#3}%
-  \endgroup
-}
+% Make control sequences which act like normal parenthesis chars.
+\let\lparen = ( \let\rparen = )
 
-% @defmethod == @defop Method
-%
-\def\defmethod{\defmethparsebody\Edefmethod\defmethodx\defmethodheader}
-%
-% #1 is the class name, #2 the method name, #3 the args.
-\def\defmethodheader#1#2#3{%
-  \dosubind{fn}{\code{#2}}{\putwordon\ \code{#1}}% entry in function index
-  \begingroup
-    \defname{#2}{\putwordMethodon\ \code{#1}}%
-    \defunargs{#3}%
-  \endgroup
-}
+% Be sure that we always have a definition for `(', etc.  For example,
+% if the fn name has parens in it, \boldbrax will not be in effect yet,
+% so TeX would otherwise complain about undefined control sequence.
+{
+  \activeparens
+  \global\let(=\lparen \global\let)=\rparen
+  \global\let[=\lbrack \global\let]=\rbrack
+  \global\let& = \&
 
-% @defcv {Class Option} foo-class foo-flag
+  \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
+  \gdef\magicamp{\let&=\amprm}
+}
 
-\def\defcv #1 {\def\defcvtype{#1}%
-\defopvarparsebody\Edefcv\defcvx\defcvarheader\defcvtype}
+\newcount\parencount
 
-\def\defcvarheader #1#2#3{%
-  \dosubind{vr}{\code{#2}}{\putwordof\ \code{#1}}% variable index entry
-  \begingroup
-    \defname{#2}{\defcvtype\ \putwordof\ #1}%
-    \defvarargs{#3}%
-  \endgroup
+% If we encounter &foo, then turn on ()-hacking afterwards
+\newif\ifampseen
+\def\amprm#1 {\ampseentrue{\bf\&#1 }}
+
+\def\parenfont{%
+  \ifampseen
+    % At the first level, print parens in roman,
+    % otherwise use the default font.
+    \ifnum \parencount=1 \rm \fi
+  \else
+    % The \sf parens (in \boldbrax) actually are a little bolder than
+    % the contained text.  This is especially needed for [ and ] .
+    \sf
+  \fi
 }
-
-% @defivar CLASS VARNAME == @defcv {Instance Variable} CLASS VARNAME
-%
-\def\defivar{\defvrparsebody\Edefivar\defivarx\defivarheader}
-%
-\def\defivarheader#1#2#3{%
-  \dosubind{vr}{\code{#2}}{\putwordof\ \code{#1}}% entry in var index
-  \begingroup
-    \defname{#2}{\putwordInstanceVariableof\ #1}%
-    \defvarargs{#3}%
-  \endgroup
+\def\infirstlevel#1{%
+  \ifampseen
+    \ifnum\parencount=1
+      #1%
+    \fi
+  \fi
 }
+\def\bfafterword#1 {#1 \bf}
 
-% @defvar
-% First, define the processing that is wanted for arguments of @defvar.
-% This is actually simple: just print them in roman.
-% This must expand the args and terminate the paragraph they make up
-\def\defvarargs #1{\normalparens #1%
-  \defargscommonending
+\def\opnr{%
+  \global\advance\parencount by 1
+  {\parenfont(}%
+  \infirstlevel \bfafterword
 }
-
-% @defvr Counter foo-count
-
-\def\defvr{\defvrparsebody\Edefvr\defvrx\defvrheader}
-
-\def\defvrheader #1#2#3{\doind {vr}{\code{#2}}%
-\begingroup\defname {#2}{#1}\defvarargs{#3}\endgroup}
-
-% @defvar == @defvr Variable
-
-\def\defvar{\defvarparsebody\Edefvar\defvarx\defvarheader}
-
-\def\defvarheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index
-\begingroup\defname {#1}{\putwordDefvar}%
-\defvarargs {#2}\endgroup %
+\def\clnr{%
+  {\parenfont)}%
+  \infirstlevel \sl
+  \global\advance\parencount by -1
 }
 
-% @defopt == @defvr {User Option}
-
-\def\defopt{\defvarparsebody\Edefopt\defoptx\defoptheader}
-
-\def\defoptheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index
-\begingroup\defname {#1}{\putwordDefopt}%
-\defvarargs {#2}\endgroup %
+\newcount\brackcount
+\def\lbrb{%
+  \global\advance\brackcount by 1
+  {\bf[}%
+}
+\def\rbrb{%
+  {\bf]}%
+  \global\advance\brackcount by -1
 }
 
-% @deftypevar int foobar
-
-\def\deftypevar{\defvarparsebody\Edeftypevar\deftypevarx\deftypevarheader}
-
-% #1 is the data type.  #2 is the name, perhaps followed by text that
-% is actually part of the data type, which should not be put into the index.
-\def\deftypevarheader #1#2{%
-\dovarind#2 \relax% Make entry in variables index
-\begingroup\defname {\defheaderxcond#1\relax$.$#2}{\putwordDeftypevar}%
-  \defargscommonending
-\endgroup}
-\def\dovarind#1 #2\relax{\doind{vr}{\code{#1}}}
-
-% @deftypevr {Global Flag} int enable
-
-\def\deftypevr{\defvrparsebody\Edeftypevr\deftypevrx\deftypevrheader}
-
-\def\deftypevrheader #1#2#3{\dovarind#3 \relax%
-\begingroup\defname {\defheaderxcond#2\relax$.$#3}{#1}
-  \defargscommonending
-\endgroup}
-
-% Now define @deftp
-% Args are printed in bold, a slight difference from @defvar.
-
-\def\deftpargs #1{\bf \defvarargs{#1}}
-
-% @deftp Class window height width ...
-
-\def\deftp{\deftpparsebody\Edeftp\deftpx\deftpheader}
-
-\def\deftpheader #1#2#3{\doind {tp}{\code{#2}}%
-\begingroup\defname {#2}{#1}\deftpargs{#3}\endgroup}
-
-% These definitions are used if you use @defunx (etc.)
-% anywhere other than immediately after a @defun or @defunx.
-%
-\def\defcvx#1 {\errmessage{@defcvx in invalid context}}
-\def\deffnx#1 {\errmessage{@deffnx in invalid context}}
-\def\defivarx#1 {\errmessage{@defivarx in invalid context}}
-\def\defmacx#1 {\errmessage{@defmacx in invalid context}}
-\def\defmethodx#1 {\errmessage{@defmethodx in invalid context}}
-\def\defoptx #1 {\errmessage{@defoptx in invalid context}}
-\def\defopx#1 {\errmessage{@defopx in invalid context}}
-\def\defspecx#1 {\errmessage{@defspecx in invalid context}}
-\def\deftpx#1 {\errmessage{@deftpx in invalid context}}
-\def\deftypefnx#1 {\errmessage{@deftypefnx in invalid context}}
-\def\deftypefunx#1 {\errmessage{@deftypefunx in invalid context}}
-\def\deftypeivarx#1 {\errmessage{@deftypeivarx in invalid context}}
-\def\deftypemethodx#1 {\errmessage{@deftypemethodx in invalid context}}
-\def\deftypeopx#1 {\errmessage{@deftypeopx in invalid context}}
-\def\deftypevarx#1 {\errmessage{@deftypevarx in invalid context}}
-\def\deftypevrx#1 {\errmessage{@deftypevrx in invalid context}}
-\def\defunx#1 {\errmessage{@defunx in invalid context}}
-\def\defvarx#1 {\errmessage{@defvarx in invalid context}}
-\def\defvrx#1 {\errmessage{@defvrx in invalid context}}
+\def\checkparencounts{%
+  \ifnum\parencount=0 \else \badparencount \fi
+  \ifnum\brackcount=0 \else \badbrackcount \fi
+}
+\def\badparencount{%
+  \errmessage{Unbalanced parentheses in @def}%
+  \global\parencount=0
+}
+\def\badbrackcount{%
+  \errmessage{Unbalanced square braces in @def}%
+  \global\brackcount=0
+}
 
 
 \message{macros,}
@@ -5557,42 +6245,68 @@ width0pt\relax} \fi
 % To do this right we need a feature of e-TeX, \scantokens,
 % which we arrange to emulate with a temporary file in ordinary TeX.
 \ifx\eTeXversion\undefined
- \newwrite\macscribble
- \def\scanmacro#1{%
-   \begingroup \newlinechar`\^^M
-   % Undo catcode changes of \startcontents and \doprintindex
-   \catcode`\@=0 \catcode`\\=\other \escapechar=`\@
-   % Append \endinput to make sure that TeX does not see the ending newline.
-   \toks0={#1\endinput}%
-   \immediate\openout\macscribble=\jobname.tmp
-   \immediate\write\macscribble{\the\toks0}%
-   \immediate\closeout\macscribble
-   \let\xeatspaces\eatspaces
-   \input \jobname.tmp
-   \endgroup
-}
-\else
-\def\scanmacro#1{%
-\begingroup \newlinechar`\^^M
-% Undo catcode changes of \startcontents and \doprintindex
-\catcode`\@=0 \catcode`\\=\other \escapechar=`\@
-\let\xeatspaces\eatspaces\scantokens{#1\endinput}\endgroup}
+  \newwrite\macscribble
+  \def\scantokens#1{%
+    \toks0={#1}%
+    \immediate\openout\macscribble=\jobname.tmp
+    \immediate\write\macscribble{\the\toks0}%
+    \immediate\closeout\macscribble
+    \input \jobname.tmp
+  }
 \fi
 
+\def\scanmacro#1{%
+  \begingroup
+    \newlinechar`\^^M
+    \let\xeatspaces\eatspaces
+    % Undo catcode changes of \startcontents and \doprintindex
+    % When called from @insertcopying or (short)caption, we need active
+    % backslash to get it printed correctly.  Previously, we had
+    % \catcode`\\=\other instead.  We'll see whether a problem appears
+    % with macro expansion.				--kasal, 19aug04
+    \catcode`\@=0 \catcode`\\=\active \escapechar=`\@
+    % ... and \example
+    \spaceisspace
+    %
+    % Append \endinput to make sure that TeX does not see the ending newline.
+    % I've verified that it is necessary both for e-TeX and for ordinary TeX
+    %							--kasal, 29nov03
+    \scantokens{#1\endinput}%
+  \endgroup
+}
+
+\def\scanexp#1{%
+  \edef\temp{\noexpand\scanmacro{#1}}%
+  \temp
+}
+
 \newcount\paramno   % Count of parameters
 \newtoks\macname    % Macro name
 \newif\ifrecursive  % Is it recursive?
-\def\macrolist{}    % List of all defined macros in the form
-                    % \do\macro1\do\macro2...
+
+% List of all defined macros in the form
+%    \definedummyword\macro1\definedummyword\macro2...
+% Currently is also contains all @aliases; the list can be split
+% if there is a need.
+\def\macrolist{}
+
+% Add the macro to \macrolist
+\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
+\def\addtomacrolistxxx#1{%
+     \toks0 = \expandafter{\macrolist\definedummyword#1}%
+     \xdef\macrolist{\the\toks0}%
+}
 
 % Utility routines.
-% Thisdoes \let #1 = #2, except with \csnames.
+% This does \let #1 = #2, with \csnames; that is,
+%   \let \csname#1\endcsname = \csname#2\endcsname
+% (except of course we have to play expansion games).
+% 
 \def\cslet#1#2{%
-\expandafter\expandafter
-\expandafter\let
-\expandafter\expandafter
-\csname#1\endcsname
-\csname#2\endcsname}
+  \expandafter\let
+  \csname#1\expandafter\endcsname
+  \csname#2\endcsname
+}
 
 % Trim leading and trailing spaces off a string.
 % Concepts from aro-bend problem 15 (see CTAN).
@@ -5619,30 +6333,36 @@ width0pt\relax} \fi
 % done by  making ^^M (\endlinechar) catcode 12 when reading the macro
 % body, and then making it the \newlinechar in \scanmacro.
 
-\def\macrobodyctxt{%
-  \catcode`\~=\other
+\def\scanctxt{%
+  \catcode`\"=\other
+  \catcode`\+=\other
+  \catcode`\<=\other
+  \catcode`\>=\other
+  \catcode`\@=\other
   \catcode`\^=\other
   \catcode`\_=\other
   \catcode`\|=\other
-  \catcode`\<=\other
-  \catcode`\>=\other
-  \catcode`\+=\other
+  \catcode`\~=\other
+}
+
+\def\scanargctxt{%
+  \scanctxt
+  \catcode`\\=\other
+  \catcode`\^^M=\other
+}
+
+\def\macrobodyctxt{%
+  \scanctxt
   \catcode`\{=\other
   \catcode`\}=\other
-  \catcode`\@=\other
   \catcode`\^^M=\other
-  \usembodybackslash}
+  \usembodybackslash
+}
 
 \def\macroargctxt{%
-  \catcode`\~=\other
-  \catcode`\^=\other
-  \catcode`\_=\other
-  \catcode`\|=\other
-  \catcode`\<=\other
-  \catcode`\>=\other
-  \catcode`\+=\other
-  \catcode`\@=\other
-  \catcode`\\=\other}
+  \scanctxt
+  \catcode`\\=\other
+}
 
 % \mbodybackslash is the definition of \ in @macro bodies.
 % It maps \foo\ => \csname macarg.foo\endcsname => #N
@@ -5673,25 +6393,21 @@ width0pt\relax} \fi
      \else \errmessage{Macro name \the\macname\space already defined}\fi
      \global\cslet{macsave.\the\macname}{\the\macname}%
      \global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
-     % Add the macroname to \macrolist
-     \toks0 = \expandafter{\macrolist\do}%
-     \xdef\macrolist{\the\toks0
-       \expandafter\noexpand\csname\the\macname\endcsname}%
+     \addtomacrolist{\the\macname}%
   \fi
   \begingroup \macrobodyctxt
   \ifrecursive \expandafter\parsermacbody
   \else \expandafter\parsemacbody
   \fi}
 
-\def\unmacro{\parsearg\dounmacro}
-\def\dounmacro#1{%
+\parseargdef\unmacro{%
   \if1\csname ismacro.#1\endcsname
     \global\cslet{#1}{macsave.#1}%
     \global\expandafter\let \csname ismacro.#1\endcsname=0%
     % Remove the macro name from \macrolist:
     \begingroup
       \expandafter\let\csname#1\endcsname \relax
-      \let\do\unmacrodo
+      \let\definedummyword\unmacrodo
       \xdef\macrolist{\macrolist}%
     \endgroup
   \else
@@ -5703,10 +6419,10 @@ width0pt\relax} \fi
 % macro definitions that have been changed to \relax.
 %
 \def\unmacrodo#1{%
-  \ifx#1\relax
+  \ifx #1\relax
     % remove this
   \else
-    \noexpand\do \noexpand #1%
+    \noexpand\definedummyword \noexpand#1%
   \fi
 }
 
@@ -5819,34 +6535,31 @@ width0pt\relax} \fi
 % {.  If so it reads up to the closing }, if not, it reads the whole
 % line.  Whatever was read is then fed to the next control sequence
 % as an argument (by \parsebrace or \parsearg)
-\def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx}
+\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
 \def\braceorlinexxx{%
   \ifx\nchar\bgroup\else
     \expandafter\parsearg
-  \fi \next}
-
-% We mant to disable all macros during \shipout so that they are not
-% expanded by \write.
-\def\turnoffmacros{\begingroup \def\do##1{\let\noexpand##1=\relax}%
-  \edef\next{\macrolist}\expandafter\endgroup\next}
+  \fi \macnamexxx}
 
 
 % @alias.
 % We need some trickery to remove the optional spaces around the equal
 % sign.  Just make them active and then expand them all to nothing.
-\def\alias{\begingroup\obeyspaces\parsearg\aliasxxx}
+\def\alias{\parseargusing\obeyspaces\aliasxxx}
 \def\aliasxxx #1{\aliasyyy#1\relax}
-\def\aliasyyy #1=#2\relax{\ignoreactivespaces
-\edef\next{\global\let\expandafter\noexpand\csname#1\endcsname=%
-           \expandafter\noexpand\csname#2\endcsname}%
-\expandafter\endgroup\next}
+\def\aliasyyy #1=#2\relax{%
+  {%
+    \expandafter\let\obeyedspace=\empty
+    \addtomacrolist{#1}%
+    \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}%
+  }%
+  \next
+}
 
 
 \message{cross references,}
-% @xref etc.
 
 \newwrite\auxfile
-
 \newif\ifhavexrefs    % True if xref values are known.
 \newif\ifwarnedxrefs  % True if we warned once that they aren't known.
 
@@ -5855,64 +6568,68 @@ width0pt\relax} \fi
 \def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
   node \samp{\ignorespaces#1{}}}
 
-% @node's job is to define \lastnode.
-\def\node{\ENVcheck\parsearg\nodezzz}
-\def\nodezzz#1{\nodexxx #1,\finishnodeparse}
-\def\nodexxx#1,#2\finishnodeparse{\gdef\lastnode{#1}}
+% @node's only job in TeX is to define \lastnode, which is used in
+% cross-references.  The @node line might or might not have commas, and
+% might or might not have spaces before the first comma, like:
+% @node foo , bar , ...
+% We don't want such trailing spaces in the node name.
+%
+\parseargdef\node{\checkenv{}\donode #1 ,\finishnodeparse}
+%
+% also remove a trailing comma, in case of something like this:
+% @node Help-Cross,  ,  , Cross-refs
+\def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse}
+\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}}
+
 \let\nwnode=\node
-\let\lastnode=\relax
-
-% The sectioning commands (@chapter, etc.) call these.
-\def\donoderef{%
-  \ifx\lastnode\relax\else
-    \expandafter\expandafter\expandafter\setref{\lastnode}%
-      {Ysectionnumberandtype}%
-    \global\let\lastnode=\relax
-  \fi
-}
-\def\unnumbnoderef{%
-  \ifx\lastnode\relax\else
-    \expandafter\expandafter\expandafter\setref{\lastnode}{Ynothing}%
-    \global\let\lastnode=\relax
-  \fi
-}
-\def\appendixnoderef{%
-  \ifx\lastnode\relax\else
-    \expandafter\expandafter\expandafter\setref{\lastnode}%
-      {Yappendixletterandtype}%
-    \global\let\lastnode=\relax
+\let\lastnode=\empty
+
+% Write a cross-reference definition for the current node.  #1 is the
+% type (Ynumbered, Yappendix, Ynothing).
+%
+\def\donoderef#1{%
+  \ifx\lastnode\empty\else
+    \setref{\lastnode}{#1}%
+    \global\let\lastnode=\empty
   \fi
 }
 
-
 % @anchor{NAME} -- define xref target at arbitrary point.
 %
 \newcount\savesfregister
-\gdef\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi}
-\gdef\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi}
-\gdef\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces}
+%
+\def\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi}
+\def\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi}
+\def\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces}
 
 % \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
-% anchor), namely NAME-title (the corresponding @chapter/etc. name),
-% NAME-pg (the page number), and NAME-snt (section number and type).
-% Called from \foonoderef.
-%
-% We have to set \indexdummies so commands such as @code in a section
-% title aren't expanded.  It would be nicer not to expand the titles in
-% the first place, but there's so many layers that that is hard to do.
-%
-% Likewise, use \turnoffactive so that punctuation chars such as underscore
-% and backslash work in node names.
-%
-\def\setref#1#2{{%
-  \atdummies
+% anchor), which consists of three parts:
+% 1) NAME-title - the current sectioning name taken from \thissection,
+%                 or the anchor name.
+% 2) NAME-snt   - section number and type, passed as the SNT arg, or
+%                 empty for anchors.
+% 3) NAME-pg    - the page number.
+%
+% This is called from \donoderef, \anchor, and \dofloat.  In the case of
+% floats, there is an additional part, which is not written here:
+% 4) NAME-lof   - the text as it should appear in a @listoffloats.
+%
+\def\setref#1#2{%
   \pdfmkdest{#1}%
-  %
-  \turnoffactive
-  \dosetq{#1-title}{Ytitle}%
-  \dosetq{#1-pg}{Ypagenumber}%
-  \dosetq{#1-snt}{#2}%
-}}
+  \iflinks
+    {%
+      \atdummies  % preserve commands, but don't expand them
+      \edef\writexrdef##1##2{%
+	\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
+	  ##1}{##2}}% these are parameters of \writexrdef
+      }%
+      \toks0 = \expandafter{\thissection}%
+      \immediate \writexrdef{title}{\the\toks0 }%
+      \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
+      \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, during \shipout
+    }%
+  \fi
+}
 
 % @xref, @pxref, and @ref generate cross-references.  For \xrefX, #1 is
 % the node name, #2 the name of the Info cross-reference, #3 the printed
@@ -5925,105 +6642,126 @@ width0pt\relax} \fi
 \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
   \unsepspaces
   \def\printedmanual{\ignorespaces #5}%
-  \def\printednodename{\ignorespaces #3}%
-  \setbox1=\hbox{\printedmanual}%
-  \setbox0=\hbox{\printednodename}%
+  \def\printedrefname{\ignorespaces #3}%
+  \setbox1=\hbox{\printedmanual\unskip}%
+  \setbox0=\hbox{\printedrefname\unskip}%
   \ifdim \wd0 = 0pt
     % No printed node name was explicitly given.
     \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax
       % Use the node name inside the square brackets.
-      \def\printednodename{\ignorespaces #1}%
+      \def\printedrefname{\ignorespaces #1}%
     \else
       % Use the actual chapter/section title appear inside
       % the square brackets.  Use the real section title if we have it.
       \ifdim \wd1 > 0pt
         % It is in another manual, so we don't have it.
-        \def\printednodename{\ignorespaces #1}%
+        \def\printedrefname{\ignorespaces #1}%
       \else
         \ifhavexrefs
           % We know the real title if we have the xref values.
-          \def\printednodename{\refx{#1-title}{}}%
+          \def\printedrefname{\refx{#1-title}{}}%
         \else
           % Otherwise just copy the Info node name.
-          \def\printednodename{\ignorespaces #1}%
+          \def\printedrefname{\ignorespaces #1}%
         \fi%
       \fi
     \fi
   \fi
   %
-  % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
-  % insert empty discretionaries after hyphens, which means that it will
-  % not find a line break at a hyphen in a node names.  Since some manuals
-  % are best written with fairly long node names, containing hyphens, this
-  % is a loss.  Therefore, we give the text of the node name again, so it
-  % is as if TeX is seeing it for the first time.
+  % Make link in pdf output.
   \ifpdf
     \leavevmode
     \getfilename{#4}%
-    {\turnoffactive \otherbackslash
+    {\indexnofonts
+     \turnoffactive
+     % See comments at \activebackslashdouble.
+     {\activebackslashdouble \xdef\pdfxrefdest{#1}%
+      \backslashparens\pdfxrefdest}%
+     %
      \ifnum\filenamelength>0
        \startlink attr{/Border [0 0 0]}%
-         goto file{\the\filename.pdf} name{#1}%
+         goto file{\the\filename.pdf} name{\pdfxrefdest}%
      \else
        \startlink attr{/Border [0 0 0]}%
-         goto name{#1}%
+         goto name{\pdfmkpgn{\pdfxrefdest}}%
      \fi
     }%
     \linkcolor
   \fi
   %
-  \ifdim \wd1 > 0pt
-    \putwordsection{} ``\printednodename'' \putwordin{} \cite{\printedmanual}%
-  \else
-    % _ (for example) has to be the character _ for the purposes of the
-    % control sequence corresponding to the node, but it has to expand
-    % into the usual \leavevmode...\vrule stuff for purposes of
-    % printing. So we \turnoffactive for the \refx-snt, back on for the
-    % printing, back off for the \refx-pg.
-    {\turnoffactive \otherbackslash
-     % Only output a following space if the -snt ref is nonempty; for
-     % @unnumbered and @anchor, it won't be.
-     \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
-     \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
-    }%
-    % output the `[mynode]' via a macro.
-    \xrefprintnodename\printednodename
+  % Float references are printed completely differently: "Figure 1.2"
+  % instead of "[somenode], p.3".  We distinguish them by the
+  % LABEL-title being set to a magic string.
+  {%
+    % Have to otherify everything special to allow the \csname to
+    % include an _ in the xref name, etc.
+    \indexnofonts
+    \turnoffactive
+    \expandafter\global\expandafter\let\expandafter\Xthisreftitle
+      \csname XR#1-title\endcsname
+  }%
+  \iffloat\Xthisreftitle
+    % If the user specified the print name (third arg) to the ref,
+    % print it instead of our usual "Figure 1.2".
+    \ifdim\wd0 = 0pt
+      \refx{#1-snt}{}%
+    \else
+      \printedrefname
+    \fi
     %
-    % But we always want a comma and a space:
-    ,\space
+    % if the user also gave the printed manual name (fifth arg), append
+    % "in MANUALNAME".
+    \ifdim \wd1 > 0pt
+      \space \putwordin{} \cite{\printedmanual}%
+    \fi
+  \else
+    % node/anchor (non-float) references.
     %
-    % output the `page 3'.
-    \turnoffactive \otherbackslash \putwordpage\tie\refx{#1-pg}{}%
+    % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
+    % insert empty discretionaries after hyphens, which means that it will
+    % not find a line break at a hyphen in a node names.  Since some manuals
+    % are best written with fairly long node names, containing hyphens, this
+    % is a loss.  Therefore, we give the text of the node name again, so it
+    % is as if TeX is seeing it for the first time.
+    \ifdim \wd1 > 0pt
+      \putwordsection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
+    \else
+      % _ (for example) has to be the character _ for the purposes of the
+      % control sequence corresponding to the node, but it has to expand
+      % into the usual \leavevmode...\vrule stuff for purposes of
+      % printing. So we \turnoffactive for the \refx-snt, back on for the
+      % printing, back off for the \refx-pg.
+      {\turnoffactive
+       % Only output a following space if the -snt ref is nonempty; for
+       % @unnumbered and @anchor, it won't be.
+       \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
+       \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
+      }%
+      % output the `[mynode]' via a macro so it can be overridden.
+      \xrefprintnodename\printedrefname
+      %
+      % But we always want a comma and a space:
+      ,\space
+      %
+      % output the `page 3'.
+      \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
+    \fi
   \fi
   \endlink
 \endgroup}
 
 % This macro is called from \xrefX for the `[nodename]' part of xref
 % output.  It's a separate macro only so it can be changed more easily,
-% since not square brackets don't work in some documents.  Particularly
+% since square brackets don't work well in some documents.  Particularly
 % one that Bob is working on :).
 %
 \def\xrefprintnodename#1{[#1]}
 
-% \dosetq is called from \setref to do the actual \write (\iflinks).
-%
-\def\dosetq#1#2{%
-  {\let\folio=0%
-   \edef\next{\write\auxfile{\internalsetq{#1}{#2}}}%
-   \iflinks \next \fi
-  }%
-}
-
-% \internalsetq{foo}{page} expands into
-%   CHARACTERS @xrdef{foo}{...expansion of \page...}
-\def\internalsetq#1#2{@xrdef{#1}{\csname #2\endcsname}}
-
-% Things to be expanded by \internalsetq.
+% Things referred to by \setref.
 %
-\def\Ypagenumber{\folio}
-\def\Ytitle{\thissection}
 \def\Ynothing{}
-\def\Ysectionnumberandtype{%
+\def\Yomitfromtoc{}
+\def\Ynumbered{%
   \ifnum\secno=0
     \putwordChapter@tie \the\chapno
   \else \ifnum\subsecno=0
@@ -6034,8 +6772,7 @@ width0pt\relax} \fi
     \putwordSection@tie \the\chapno.\the\secno.\the\subsecno.\the\subsubsecno
   \fi\fi\fi
 }
-
-\def\Yappendixletterandtype{%
+\def\Yappendix{%
   \ifnum\secno=0
      \putwordAppendix@tie @char\the\appendixno{}%
   \else \ifnum\subsecno=0
@@ -6048,15 +6785,6 @@ width0pt\relax} \fi
   \fi\fi\fi
 }
 
-% Use TeX 3.0's \inputlineno to get the line number, for better error
-% messages, but if we're using an old version of TeX, don't do anything.
-%
-\ifx\inputlineno\thisisundefined
-  \let\linenumber = \empty % Pre-3.0.
-\else
-  \def\linenumber{\the\inputlineno:\space}
-\fi
-
 % Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME.
 % If its value is nonempty, SUFFIX is output afterward.
 %
@@ -6065,7 +6793,7 @@ width0pt\relax} \fi
     \indexnofonts
     \otherbackslash
     \expandafter\global\expandafter\let\expandafter\thisrefX
-      \csname X#1\endcsname
+      \csname XR#1\endcsname
   }%
   \ifx\thisrefX\relax
     % If not defined, say something at least.
@@ -6087,12 +6815,54 @@ width0pt\relax} \fi
   #2% Output the suffix in any case.
 }
 
-% This is the macro invoked by entries in the aux file.
+% This is the macro invoked by entries in the aux file.  Usually it's
+% just a \def (we prepend XR to the control sequence name to avoid
+% collisions).  But if this is a float type, we have more work to do.
 %
-\def\xrdef#1{\expandafter\gdef\csname X#1\endcsname}
+\def\xrdef#1#2{%
+  {% The node name might contain 8-bit characters, which in our current
+   % implementation are changed to commands like @'e.  Don't let these
+   % mess up the control sequence name.
+    \indexnofonts
+    \turnoffactive
+    \xdef\safexrefname{#1}%
+  }%
+  %
+  \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref
+  %
+  % Was that xref control sequence that we just defined for a float?
+  \expandafter\iffloat\csname XR\safexrefname\endcsname
+    % it was a float, and we have the (safe) float type in \iffloattype.
+    \expandafter\let\expandafter\floatlist
+      \csname floatlist\iffloattype\endcsname
+    %
+    % Is this the first time we've seen this float type?
+    \expandafter\ifx\floatlist\relax
+      \toks0 = {\do}% yes, so just \do
+    \else
+      % had it before, so preserve previous elements in list.
+      \toks0 = \expandafter{\floatlist\do}%
+    \fi
+    %
+    % Remember this xref in the control sequence \floatlistFLOATTYPE,
+    % for later use in \listoffloats.
+    \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0
+      {\safexrefname}}%
+  \fi
+}
 
 % Read the last existing aux file, if any.  No error if none exists.
-\def\readauxfile{\begingroup
+%
+\def\tryauxfile{%
+  \openin 1 \jobname.aux
+  \ifeof 1 \else
+    \readdatafile{aux}%
+    \global\havexrefstrue
+  \fi
+  \closein 1
+}
+
+\def\setupdatafile{%
   \catcode`\^^@=\other
   \catcode`\^^A=\other
   \catcode`\^^B=\other
@@ -6150,41 +6920,40 @@ width0pt\relax} \fi
   \catcode`\%=\other
   \catcode`+=\other % avoid \+ for paranoia even though we've turned it off
   %
-  % Make the characters 128-255 be printing characters
+  % This is to support \ in node names and titles, since the \
+  % characters end up in a \csname.  It's easier than
+  % leaving it active and making its active definition an actual \
+  % character.  What I don't understand is why it works in the *value*
+  % of the xrdef.  Seems like it should be a catcode12 \, and that
+  % should not typeset properly.  But it works, so I'm moving on for
+  % now.  --karl, 15jan04.
+  \catcode`\\=\other
+  %
+  % Make the characters 128-255 be printing characters.
   {%
-    \count 1=128
+    \count1=128
     \def\loop{%
-      \catcode\count 1=\other
-      \advance\count 1 by 1
-      \ifnum \count 1<256 \loop \fi
+      \catcode\count1=\other
+      \advance\count1 by 1
+      \ifnum \count1<256 \loop \fi
     }%
   }%
   %
-  % Turn off \ as an escape so we do not lose on
-  % entries which were dumped with control sequences in their names.
-  % For example, @xrdef{$\leq $-fun}{page ...} made by @defun ^^
-  % Reference to such entries still does not work the way one would wish,
-  % but at least they do not bomb out when the aux file is read in.
-  \catcode`\\=\other
-  %
-  % @ is our escape character in .aux files.
+  % @ is our escape character in .aux files, and we need braces.
   \catcode`\{=1
   \catcode`\}=2
   \catcode`\@=0
-  %
-  \openin 1 \jobname.aux
-  \ifeof 1 \else
-    \closein 1
-    \input \jobname.aux
-    \global\havexrefstrue
-    \global\warnedobstrue
-  \fi
-  % Open the new aux file.  TeX will close it automatically at exit.
-  \openout\auxfile=\jobname.aux
+}
+
+\def\readdatafile#1{%
+\begingroup
+  \setupdatafile
+  \input\jobname.#1
 \endgroup}
 
 
-% Footnotes.
+\message{insertions,}
+% including footnotes.
 
 \newcount \footnoteno
 
@@ -6198,13 +6967,12 @@ width0pt\relax} \fi
 % @footnotestyle is meaningful for info output only.
 \let\footnotestyle=\comment
 
-\let\ptexfootnote=\footnote
-
 {\catcode `\@=11
 %
 % Auto-number footnotes.  Otherwise like plain.
 \gdef\footnote{%
   \let\indent=\ptexindent
+  \let\noindent=\ptexnoindent
   \global\advance\footnoteno by \@ne
   \edef\thisfootno{$^{\the\footnoteno}$}%
   %
@@ -6222,17 +6990,12 @@ width0pt\relax} \fi
 % Don't bother with the trickery in plain.tex to not require the
 % footnote text as a parameter.  Our footnotes don't need to be so general.
 %
-% Oh yes, they do; otherwise, @ifset and anything else that uses
-% \parseargline fail inside footnotes because the tokens are fixed when
+% Oh yes, they do; otherwise, @ifset (and anything else that uses
+% \parseargline) fails inside footnotes because the tokens are fixed when
 % the footnote is read.  --karl, 16nov96.
 %
-% The start of the footnote looks usually like this:
-\gdef\startfootins{\insert\footins\bgroup}
-%
-% ... but this macro is redefined inside @multitable.
-%
 \gdef\dofootnote{%
-  \startfootins
+  \insert\footins\bgroup
   % We want to typeset this text as a normal paragraph, even if the
   % footnote reference occurs in (for example) a display environment.
   % So reset some parameters.
@@ -6268,40 +7031,66 @@ width0pt\relax} \fi
 }
 }%end \catcode `\@=11
 
-% @| inserts a changebar to the left of the current line.  It should
-% surround any changed text.  This approach does *not* work if the
-% change spans more than two lines of output.  To handle that, we would
-% have adopt a much more difficult approach (putting marks into the main
-% vertical list for the beginning and end of each change).
+% In case a @footnote appears in a vbox, save the footnote text and create
+% the real \insert just after the vbox finished.  Otherwise, the insertion
+% would be lost.
+% Similarily, if a @footnote appears inside an alignment, save the footnote
+% text to a box and make the \insert when a row of the table is finished.
+% And the same can be done for other insert classes.  --kasal, 16nov03.
+
+% Replace the \insert primitive by a cheating macro.
+% Deeper inside, just make sure that the saved insertions are not spilled
+% out prematurely.
 %
-\def\|{%
-  % \vadjust can only be used in horizontal mode.
-  \leavevmode
-  %
-  % Append this vertical mode material after the current line in the output.
-  \vadjust{%
-    % We want to insert a rule with the height and depth of the current
-    % leading; that is exactly what \strutbox is supposed to record.
-    \vskip-\baselineskip
-    %
-    % \vadjust-items are inserted at the left edge of the type.  So
-    % the \llap here moves out into the left-hand margin.
-    \llap{%
-      %
-      % For a thicker or thinner bar, change the `1pt'.
-      \vrule height\baselineskip width1pt
-      %
-      % This is the space between the bar and the text.
-      \hskip 12pt
-    }%
-  }%
+\def\startsavinginserts{%
+  \ifx \insert\ptexinsert
+    \let\insert\saveinsert
+  \else
+    \let\checkinserts\relax
+  \fi
 }
 
-% For a final copy, take out the rectangles
-% that mark overfull boxes (in case you have decided
-% that the text looks ok even though it passes the margin).
+% This \insert replacement works for both \insert\footins{foo} and
+% \insert\footins\bgroup foo\egroup, but it doesn't work for \insert27{foo}.
 %
-\def\finalout{\overfullrule=0pt}
+\def\saveinsert#1{%
+  \edef\next{\noexpand\savetobox \makeSAVEname#1}%
+  \afterassignment\next
+  % swallow the left brace
+  \let\temp =
+}
+\def\makeSAVEname#1{\makecsname{SAVE\expandafter\gobble\string#1}}
+\def\savetobox#1{\global\setbox#1 = \vbox\bgroup \unvbox#1}
+
+\def\checksaveins#1{\ifvoid#1\else \placesaveins#1\fi}
+
+\def\placesaveins#1{%
+  \ptexinsert \csname\expandafter\gobblesave\string#1\endcsname
+    {\box#1}%
+}
+
+% eat @SAVE -- beware, all of them have catcode \other:
+{
+  \def\dospecials{\do S\do A\do V\do E} \uncatcodespecials  %  ;-)
+  \gdef\gobblesave @SAVE{}
+}
+
+% initialization:
+\def\newsaveins #1{%
+  \edef\next{\noexpand\newsaveinsX \makeSAVEname#1}%
+  \next
+}
+\def\newsaveinsX #1{%
+  \csname newbox\endcsname #1%
+  \expandafter\def\expandafter\checkinserts\expandafter{\checkinserts
+    \checksaveins #1}%
+}
+
+% initialize:
+\let\checkinserts\empty
+\newsaveins\footins
+\newsaveins\margin
+
 
 % @image.  We use the macros from epsf.tex to support this.
 % If epsf.tex is not installed and @image is used, we complain.
@@ -6311,12 +7100,12 @@ width0pt\relax} \fi
 % undone and the next image would fail.
 \openin 1 = epsf.tex
 \ifeof 1 \else
-  \closein 1
   % Do not bother showing banner with epsf.tex v2.7k (available in
   % doc/epsf.tex and on ctan).
   \def\epsfannounce{\toks0 = }%
   \input epsf.tex
 \fi
+\closein 1
 %
 % We will only complain once about lack of epsf.tex.
 \newif\ifwarnednoepsf
@@ -6355,7 +7144,7 @@ width0pt\relax} \fi
     % above and below.
     \nobreak\vskip\parskip
     \nobreak
-    \line\bgroup\hss
+    \line\bgroup
   \fi
   %
   % Output the image.
@@ -6368,45 +7157,1103 @@ width0pt\relax} \fi
     \epsfbox{#1.eps}%
   \fi
   %
-  \ifimagevmode \hss \egroup \bigbreak \fi  % space after the image
+  \ifimagevmode \egroup \bigbreak \fi  % space after the image
 \endgroup}
 
 
+% @float FLOATTYPE,LABEL,LOC ... @end float for displayed figures, tables,
+% etc.  We don't actually implement floating yet, we always include the
+% float "here".  But it seemed the best name for the future.
+%
+\envparseargdef\float{\eatcommaspace\eatcommaspace\dofloat#1, , ,\finish}
+
+% There may be a space before second and/or third parameter; delete it.
+\def\eatcommaspace#1, {#1,}
+
+% #1 is the optional FLOATTYPE, the text label for this float, typically
+% "Figure", "Table", "Example", etc.  Can't contain commas.  If omitted,
+% this float will not be numbered and cannot be referred to.
+%
+% #2 is the optional xref label.  Also must be present for the float to
+% be referable.
+%
+% #3 is the optional positioning argument; for now, it is ignored.  It
+% will somehow specify the positions allowed to float to (here, top, bottom).
+%
+% We keep a separate counter for each FLOATTYPE, which we reset at each
+% chapter-level command.
+\let\resetallfloatnos=\empty
+%
+\def\dofloat#1,#2,#3,#4\finish{%
+  \let\thiscaption=\empty
+  \let\thisshortcaption=\empty
+  %
+  % don't lose footnotes inside @float.
+  %
+  % BEWARE: when the floats start float, we have to issue warning whenever an
+  % insert appears inside a float which could possibly float. --kasal, 26may04
+  %
+  \startsavinginserts
+  %
+  % We can't be used inside a paragraph.
+  \par
+  %
+  \vtop\bgroup
+    \def\floattype{#1}%
+    \def\floatlabel{#2}%
+    \def\floatloc{#3}% we do nothing with this yet.
+    %
+    \ifx\floattype\empty
+      \let\safefloattype=\empty
+    \else
+      {%
+        % the floattype might have accents or other special characters,
+        % but we need to use it in a control sequence name.
+        \indexnofonts
+        \turnoffactive
+        \xdef\safefloattype{\floattype}%
+      }%
+    \fi
+    %
+    % If label is given but no type, we handle that as the empty type.
+    \ifx\floatlabel\empty \else
+      % We want each FLOATTYPE to be numbered separately (Figure 1,
+      % Table 1, Figure 2, ...).  (And if no label, no number.)
+      %
+      \expandafter\getfloatno\csname\safefloattype floatno\endcsname
+      \global\advance\floatno by 1
+      %
+      {%
+        % This magic value for \thissection is output by \setref as the
+        % XREFLABEL-title value.  \xrefX uses it to distinguish float
+        % labels (which have a completely different output format) from
+        % node and anchor labels.  And \xrdef uses it to construct the
+        % lists of floats.
+        %
+        \edef\thissection{\floatmagic=\safefloattype}%
+        \setref{\floatlabel}{Yfloat}%
+      }%
+    \fi
+    %
+    % start with \parskip glue, I guess.
+    \vskip\parskip
+    %
+    % Don't suppress indentation if a float happens to start a section.
+    \restorefirstparagraphindent
+}
+
+% we have these possibilities:
+% @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap
+% @float Foo,lbl & no caption:    Foo 1.1
+% @float Foo & @caption{Cap}:     Foo: Cap
+% @float Foo & no caption:        Foo
+% @float ,lbl & Caption{Cap}:     1.1: Cap
+% @float ,lbl & no caption:       1.1
+% @float & @caption{Cap}:         Cap
+% @float & no caption:
+%
+\def\Efloat{%
+    \let\floatident = \empty
+    %
+    % In all cases, if we have a float type, it comes first.
+    \ifx\floattype\empty \else \def\floatident{\floattype}\fi
+    %
+    % If we have an xref label, the number comes next.
+    \ifx\floatlabel\empty \else
+      \ifx\floattype\empty \else % if also had float type, need tie first.
+        \appendtomacro\floatident{\tie}%
+      \fi
+      % the number.
+      \appendtomacro\floatident{\chaplevelprefix\the\floatno}%
+    \fi
+    %
+    % Start the printed caption with what we've constructed in
+    % \floatident, but keep it separate; we need \floatident again.
+    \let\captionline = \floatident
+    %
+    \ifx\thiscaption\empty \else
+      \ifx\floatident\empty \else
+	\appendtomacro\captionline{: }% had ident, so need a colon between
+      \fi
+      %
+      % caption text.
+      \appendtomacro\captionline{\scanexp\thiscaption}%
+    \fi
+    %
+    % If we have anything to print, print it, with space before.
+    % Eventually this needs to become an \insert.
+    \ifx\captionline\empty \else
+      \vskip.5\parskip
+      \captionline
+      %
+      % Space below caption.
+      \vskip\parskip
+    \fi
+    %
+    % If have an xref label, write the list of floats info.  Do this
+    % after the caption, to avoid chance of it being a breakpoint.
+    \ifx\floatlabel\empty \else
+      % Write the text that goes in the lof to the aux file as
+      % \floatlabel-lof.  Besides \floatident, we include the short
+      % caption if specified, else the full caption if specified, else nothing.
+      {%
+        \atdummies
+        %
+        % since we read the caption text in the macro world, where ^^M
+        % is turned into a normal character, we have to scan it back, so
+        % we don't write the literal three characters "^^M" into the aux file.
+	\scanexp{%
+	  \xdef\noexpand\gtemp{%
+	    \ifx\thisshortcaption\empty
+	      \thiscaption
+	    \else
+	      \thisshortcaption
+	    \fi
+	  }%
+	}%
+        \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident
+	  \ifx\gtemp\empty \else : \gtemp \fi}}%
+      }%
+    \fi
+  \egroup  % end of \vtop
+  %
+  % place the captured inserts
+  %
+  % BEWARE: when the floats start floating, we have to issue warning
+  % whenever an insert appears inside a float which could possibly
+  % float. --kasal, 26may04
+  %
+  \checkinserts
+}
+
+% Append the tokens #2 to the definition of macro #1, not expanding either.
+%
+\def\appendtomacro#1#2{%
+  \expandafter\def\expandafter#1\expandafter{#1#2}%
+}
+
+% @caption, @shortcaption
+%
+\def\caption{\docaption\thiscaption}
+\def\shortcaption{\docaption\thisshortcaption}
+\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption}
+\def\defcaption#1#2{\egroup \def#1{#2}}
+
+% The parameter is the control sequence identifying the counter we are
+% going to use.  Create it if it doesn't exist and assign it to \floatno.
+\def\getfloatno#1{%
+  \ifx#1\relax
+      % Haven't seen this figure type before.
+      \csname newcount\endcsname #1%
+      %
+      % Remember to reset this floatno at the next chap.
+      \expandafter\gdef\expandafter\resetallfloatnos
+        \expandafter{\resetallfloatnos #1=0 }%
+  \fi
+  \let\floatno#1%
+}
+
+% \setref calls this to get the XREFLABEL-snt value.  We want an @xref
+% to the FLOATLABEL to expand to "Figure 3.1".  We call \setref when we
+% first read the @float command.
+%
+\def\Yfloat{\floattype@tie \chaplevelprefix\the\floatno}%
+
+% Magic string used for the XREFLABEL-title value, so \xrefX can
+% distinguish floats from other xref types.
+\def\floatmagic{!!float!!}
+
+% #1 is the control sequence we are passed; we expand into a conditional
+% which is true if #1 represents a float ref.  That is, the magic
+% \thissection value which we \setref above.
+%
+\def\iffloat#1{\expandafter\doiffloat#1==\finish}
+%
+% #1 is (maybe) the \floatmagic string.  If so, #2 will be the
+% (safe) float type for this float.  We set \iffloattype to #2.
+%
+\def\doiffloat#1=#2=#3\finish{%
+  \def\temp{#1}%
+  \def\iffloattype{#2}%
+  \ifx\temp\floatmagic
+}
+
+% @listoffloats FLOATTYPE - print a list of floats like a table of contents.
+%
+\parseargdef\listoffloats{%
+  \def\floattype{#1}% floattype
+  {%
+    % the floattype might have accents or other special characters,
+    % but we need to use it in a control sequence name.
+    \indexnofonts
+    \turnoffactive
+    \xdef\safefloattype{\floattype}%
+  }%
+  %
+  % \xrdef saves the floats as a \do-list in \floatlistSAFEFLOATTYPE.
+  \expandafter\ifx\csname floatlist\safefloattype\endcsname \relax
+    \ifhavexrefs
+      % if the user said @listoffloats foo but never @float foo.
+      \message{\linenumber No `\safefloattype' floats to list.}%
+    \fi
+  \else
+    \begingroup
+      \leftskip=\tocindent  % indent these entries like a toc
+      \let\do=\listoffloatsdo
+      \csname floatlist\safefloattype\endcsname
+    \endgroup
+  \fi
+}
+
+% This is called on each entry in a list of floats.  We're passed the
+% xref label, in the form LABEL-title, which is how we save it in the
+% aux file.  We strip off the -title and look up \XRLABEL-lof, which
+% has the text we're supposed to typeset here.
+%
+% Figures without xref labels will not be included in the list (since
+% they won't appear in the aux file).
+%
+\def\listoffloatsdo#1{\listoffloatsdoentry#1\finish}
+\def\listoffloatsdoentry#1-title\finish{{%
+  % Can't fully expand XR#1-lof because it can contain anything.  Just
+  % pass the control sequence.  On the other hand, XR#1-pg is just the
+  % page number, and we want to fully expand that so we can get a link
+  % in pdf output.
+  \toksA = \expandafter{\csname XR#1-lof\endcsname}%
+  %
+  % use the same \entry macro we use to generate the TOC and index.
+  \edef\writeentry{\noexpand\entry{\the\toksA}{\csname XR#1-pg\endcsname}}%
+  \writeentry
+}}
+
+
 \message{localization,}
-% and i18n.
 
 % @documentlanguage is usually given very early, just after
 % @setfilename.  If done too late, it may not override everything
 % properly.  Single argument is the language abbreviation.
 % It would be nice if we could set up a hyphenation file here.
 %
-\def\documentlanguage{\parsearg\dodocumentlanguage}
-\def\dodocumentlanguage#1{%
+\parseargdef\documentlanguage{%
   \tex % read txi-??.tex file in plain TeX.
-  % Read the file if it exists.
-  \openin 1 txi-#1.tex
-  \ifeof1
-    \errhelp = \nolanghelp
-    \errmessage{Cannot read language file txi-#1.tex}%
-    \let\temp = \relax
-  \else
-    \def\temp{\input txi-#1.tex }%
-  \fi
-  \temp
+    % Read the file if it exists.
+    \openin 1 txi-#1.tex
+    \ifeof 1
+      \errhelp = \nolanghelp
+      \errmessage{Cannot read language file txi-#1.tex}%
+    \else
+      \input txi-#1.tex
+    \fi
+    \closein 1
   \endgroup
 }
 \newhelp\nolanghelp{The given language definition file cannot be found or
 is empty.  Maybe you need to install it?  In the current directory
 should work if nowhere else does.}
 
+% Set the catcode of characters 128 through 255 to the specified number.
+%
+\def\setnonasciicharscatcode#1{%
+   \count255=128
+   \loop\ifnum\count255<256
+      \global\catcode\count255=#1
+      \advance\count255 by 1
+   \repeat
+}
+
+% @documentencoding sets the definition of non-ASCII characters
+% according to the specified encoding.
+%
+\parseargdef\documentencoding{%
+  % Encoding being declared for the document.
+  \def\declaredencoding{\csname #1.enc\endcsname}%
+  %
+  % Supported encodings: names converted to tokens in order to be able
+  % to compare them with \ifx.
+  \def\ascii{\csname US-ASCII.enc\endcsname}%
+  \def\latnine{\csname ISO-8859-15.enc\endcsname}%
+  \def\latone{\csname ISO-8859-1.enc\endcsname}%
+  \def\lattwo{\csname ISO-8859-2.enc\endcsname}%
+  \def\utfeight{\csname UTF-8.enc\endcsname}%
+  %
+  \ifx \declaredencoding \ascii
+     \asciichardefs
+  %
+  \else \ifx \declaredencoding \lattwo
+     \setnonasciicharscatcode\active
+     \lattwochardefs
+  %
+  \else \ifx \declaredencoding \latone 
+     \setnonasciicharscatcode\active
+     \latonechardefs
+  %
+  \else \ifx \declaredencoding \latnine
+     \setnonasciicharscatcode\active
+     \latninechardefs
+  %
+  \else \ifx \declaredencoding \utfeight
+     \setnonasciicharscatcode\active
+     \utfeightchardefs
+  %
+  \else 
+    \message{Unknown document encoding #1, ignoring.}%
+  %
+  \fi % utfeight
+  \fi % latnine
+  \fi % latone
+  \fi % lattwo
+  \fi % ascii
+}
+
+% A message to be logged when using a character that isn't available
+% the default font encoding (OT1).
+% 
+\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}}
+
+% Take account of \c (plain) vs. \, (Texinfo) difference.
+\def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi}
+
+% First, make active non-ASCII characters in order for them to be
+% correctly categorized when TeX reads the replacement text of
+% macros containing the character definitions.
+\setnonasciicharscatcode\active
+%
+% Latin1 (ISO-8859-1) character definitions.
+\def\latonechardefs{%
+  \gdef^^a0{~} 
+  \gdef^^a1{\exclamdown}
+  \gdef^^a2{\missingcharmsg{CENT SIGN}} 
+  \gdef^^a3{{\pounds}}
+  \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
+  \gdef^^a5{\missingcharmsg{YEN SIGN}}
+  \gdef^^a6{\missingcharmsg{BROKEN BAR}} 
+  \gdef^^a7{\S}
+  \gdef^^a8{\"{}} 
+  \gdef^^a9{\copyright} 
+  \gdef^^aa{\ordf}
+  \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}} 
+  \gdef^^ac{$\lnot$}
+  \gdef^^ad{\-} 
+  \gdef^^ae{\registeredsymbol} 
+  \gdef^^af{\={}}
+  %
+  \gdef^^b0{\textdegree}
+  \gdef^^b1{$\pm$}
+  \gdef^^b2{$^2$}
+  \gdef^^b3{$^3$}
+  \gdef^^b4{\'{}}
+  \gdef^^b5{$\mu$}
+  \gdef^^b6{\P}
+  %
+  \gdef^^b7{$^.$}
+  \gdef^^b8{\cedilla\ }
+  \gdef^^b9{$^1$}
+  \gdef^^ba{\ordm}
+  %
+  \gdef^^bb{\missingcharmsg{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}}
+  \gdef^^bc{$1\over4$}
+  \gdef^^bd{$1\over2$}
+  \gdef^^be{$3\over4$}
+  \gdef^^bf{\questiondown}
+  %
+  \gdef^^c0{\`A}
+  \gdef^^c1{\'A}
+  \gdef^^c2{\^A}
+  \gdef^^c3{\~A}
+  \gdef^^c4{\"A}
+  \gdef^^c5{\ringaccent A} 
+  \gdef^^c6{\AE}
+  \gdef^^c7{\cedilla C}
+  \gdef^^c8{\`E}
+  \gdef^^c9{\'E}
+  \gdef^^ca{\^E}
+  \gdef^^cb{\"E}
+  \gdef^^cc{\`I}
+  \gdef^^cd{\'I}
+  \gdef^^ce{\^I}
+  \gdef^^cf{\"I}
+  %
+  \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER ETH}}
+  \gdef^^d1{\~N}
+  \gdef^^d2{\`O}
+  \gdef^^d3{\'O}
+  \gdef^^d4{\^O}
+  \gdef^^d5{\~O}
+  \gdef^^d6{\"O}
+  \gdef^^d7{$\times$}
+  \gdef^^d8{\O}
+  \gdef^^d9{\`U}
+  \gdef^^da{\'U}
+  \gdef^^db{\^U}
+  \gdef^^dc{\"U}
+  \gdef^^dd{\'Y}
+  \gdef^^de{\missingcharmsg{LATIN CAPITAL LETTER THORN}}
+  \gdef^^df{\ss}
+  %
+  \gdef^^e0{\`a}
+  \gdef^^e1{\'a}
+  \gdef^^e2{\^a}
+  \gdef^^e3{\~a}
+  \gdef^^e4{\"a}
+  \gdef^^e5{\ringaccent a}
+  \gdef^^e6{\ae}
+  \gdef^^e7{\cedilla c}
+  \gdef^^e8{\`e}
+  \gdef^^e9{\'e}
+  \gdef^^ea{\^e}
+  \gdef^^eb{\"e}
+  \gdef^^ec{\`{\dotless i}}
+  \gdef^^ed{\'{\dotless i}}
+  \gdef^^ee{\^{\dotless i}}
+  \gdef^^ef{\"{\dotless i}}
+  %
+  \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER ETH}}
+  \gdef^^f1{\~n}
+  \gdef^^f2{\`o}
+  \gdef^^f3{\'o}
+  \gdef^^f4{\^o}
+  \gdef^^f5{\~o}
+  \gdef^^f6{\"o}
+  \gdef^^f7{$\div$}
+  \gdef^^f8{\o}
+  \gdef^^f9{\`u}
+  \gdef^^fa{\'u}
+  \gdef^^fb{\^u}
+  \gdef^^fc{\"u}
+  \gdef^^fd{\'y}
+  \gdef^^fe{\missingcharmsg{LATIN SMALL LETTER THORN}}
+  \gdef^^ff{\"y}
+}
+
+% Latin9 (ISO-8859-15) encoding character definitions.
+\def\latninechardefs{%
+  % Encoding is almost identical to Latin1.
+  \latonechardefs
+  %
+  \gdef^^a4{\euro}
+  \gdef^^a6{\v S}
+  \gdef^^a8{\v s}
+  \gdef^^b4{\v Z}
+  \gdef^^b8{\v z}
+  \gdef^^bc{\OE}
+  \gdef^^bd{\oe}
+  \gdef^^be{\"Y}
+}
+
+% Latin2 (ISO-8859-2) character definitions.
+\def\lattwochardefs{%
+  \gdef^^a0{~}
+  \gdef^^a1{\missingcharmsg{LATIN CAPITAL LETTER A WITH OGONEK}}
+  \gdef^^a2{\u{}}
+  \gdef^^a3{\L}
+  \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
+  \gdef^^a5{\v L}
+  \gdef^^a6{\'S}
+  \gdef^^a7{\S}
+  \gdef^^a8{\"{}}
+  \gdef^^a9{\v S}
+  \gdef^^aa{\cedilla S}
+  \gdef^^ab{\v T}
+  \gdef^^ac{\'Z}
+  \gdef^^ad{\-}
+  \gdef^^ae{\v Z}
+  \gdef^^af{\dotaccent Z}
+  %
+  \gdef^^b0{\textdegree}
+  \gdef^^b1{\missingcharmsg{LATIN SMALL LETTER A WITH OGONEK}}
+  \gdef^^b2{\missingcharmsg{OGONEK}}
+  \gdef^^b3{\l}
+  \gdef^^b4{\'{}}
+  \gdef^^b5{\v l}
+  \gdef^^b6{\'s}
+  \gdef^^b7{\v{}}
+  \gdef^^b8{\cedilla\ }
+  \gdef^^b9{\v s}
+  \gdef^^ba{\cedilla s}
+  \gdef^^bb{\v t}
+  \gdef^^bc{\'z}
+  \gdef^^bd{\H{}}
+  \gdef^^be{\v z}
+  \gdef^^bf{\dotaccent z}
+  %
+  \gdef^^c0{\'R}
+  \gdef^^c1{\'A}
+  \gdef^^c2{\^A}
+  \gdef^^c3{\u A}
+  \gdef^^c4{\"A}
+  \gdef^^c5{\'L}
+  \gdef^^c6{\'C}
+  \gdef^^c7{\cedilla C}
+  \gdef^^c8{\v C}
+  \gdef^^c9{\'E}
+  \gdef^^ca{\missingcharmsg{LATIN CAPITAL LETTER E WITH OGONEK}}
+  \gdef^^cb{\"E}
+  \gdef^^cc{\v E}
+  \gdef^^cd{\'I}
+  \gdef^^ce{\^I}
+  \gdef^^cf{\v D}
+  %
+  \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER D WITH STROKE}}
+  \gdef^^d1{\'N}
+  \gdef^^d2{\v N}
+  \gdef^^d3{\'O}
+  \gdef^^d4{\^O}
+  \gdef^^d5{\H O}
+  \gdef^^d6{\"O}
+  \gdef^^d7{$\times$}
+  \gdef^^d8{\v R}
+  \gdef^^d9{\ringaccent U} 
+  \gdef^^da{\'U}
+  \gdef^^db{\H U}
+  \gdef^^dc{\"U}
+  \gdef^^dd{\'Y}
+  \gdef^^de{\cedilla T}
+  \gdef^^df{\ss}
+  %
+  \gdef^^e0{\'r}
+  \gdef^^e1{\'a}
+  \gdef^^e2{\^a}
+  \gdef^^e3{\u a}
+  \gdef^^e4{\"a}
+  \gdef^^e5{\'l}
+  \gdef^^e6{\'c}
+  \gdef^^e7{\cedilla c}
+  \gdef^^e8{\v c}
+  \gdef^^e9{\'e}
+  \gdef^^ea{\missingcharmsg{LATIN SMALL LETTER E WITH OGONEK}}
+  \gdef^^eb{\"e}
+  \gdef^^ec{\v e}
+  \gdef^^ed{\'\i}
+  \gdef^^ee{\^\i}
+  \gdef^^ef{\v d}
+  %
+  \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER D WITH STROKE}}
+  \gdef^^f1{\'n}
+  \gdef^^f2{\v n}
+  \gdef^^f3{\'o}
+  \gdef^^f4{\^o}
+  \gdef^^f5{\H o}
+  \gdef^^f6{\"o}
+  \gdef^^f7{$\div$}
+  \gdef^^f8{\v r}
+  \gdef^^f9{\ringaccent u}
+  \gdef^^fa{\'u}
+  \gdef^^fb{\H u}
+  \gdef^^fc{\"u}
+  \gdef^^fd{\'y}
+  \gdef^^fe{\cedilla t}
+  \gdef^^ff{\dotaccent{}}
+}
+
+% UTF-8 character definitions.
+% 
+% This code to support UTF-8 is based on LaTeX's utf8.def, with some
+% changes for Texinfo conventions.  It is included here under the GPL by
+% permission from Frank Mittelbach and the LaTeX team.
+% 
+\newcount\countUTFx
+\newcount\countUTFy
+\newcount\countUTFz
+
+\gdef\UTFviiiTwoOctets#1#2{\expandafter
+   \UTFviiiDefined\csname u8:#1\string #2\endcsname}
+%
+\gdef\UTFviiiThreeOctets#1#2#3{\expandafter
+   \UTFviiiDefined\csname u8:#1\string #2\string #3\endcsname}
+%
+\gdef\UTFviiiFourOctets#1#2#3#4{\expandafter
+   \UTFviiiDefined\csname u8:#1\string #2\string #3\string #4\endcsname}
+
+\gdef\UTFviiiDefined#1{%
+  \ifx #1\relax
+    \message{\linenumber Unicode char \string #1 not defined for Texinfo}%
+  \else
+    \expandafter #1%
+  \fi
+}
+
+\begingroup
+  \catcode`\~13
+  \catcode`\"12
+
+  \def\UTFviiiLoop{%
+    \global\catcode\countUTFx\active
+    \uccode`\~\countUTFx
+    \uppercase\expandafter{\UTFviiiTmp}%
+    \advance\countUTFx by 1
+    \ifnum\countUTFx < \countUTFy
+      \expandafter\UTFviiiLoop
+    \fi}
 
-% @documentencoding should change something in TeX eventually, most
-% likely, but for now just recognize it.
-\let\documentencoding = \comment
+  \countUTFx = "C2
+  \countUTFy = "E0
+  \def\UTFviiiTmp{%
+    \xdef~{\noexpand\UTFviiiTwoOctets\string~}}
+  \UTFviiiLoop
+
+  \countUTFx = "E0
+  \countUTFy = "F0
+  \def\UTFviiiTmp{%
+    \xdef~{\noexpand\UTFviiiThreeOctets\string~}}
+  \UTFviiiLoop
+
+  \countUTFx = "F0
+  \countUTFy = "F4
+  \def\UTFviiiTmp{%
+    \xdef~{\noexpand\UTFviiiFourOctets\string~}}
+  \UTFviiiLoop
+\endgroup
 
+\begingroup
+  \catcode`\"=12
+  \catcode`\<=12
+  \catcode`\.=12
+  \catcode`\,=12
+  \catcode`\;=12
+  \catcode`\!=12
+  \catcode`\~=13
+
+  \gdef\DeclareUnicodeCharacter#1#2{%
+    \countUTFz = "#1\relax
+    \wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
+    \begingroup
+      \parseXMLCharref
+      \def\UTFviiiTwoOctets##1##2{%
+        \csname u8:##1\string ##2\endcsname}%
+      \def\UTFviiiThreeOctets##1##2##3{%
+        \csname u8:##1\string ##2\string ##3\endcsname}%
+      \def\UTFviiiFourOctets##1##2##3##4{%
+        \csname u8:##1\string ##2\string ##3\string ##4\endcsname}%
+      \expandafter\expandafter\expandafter\expandafter
+       \expandafter\expandafter\expandafter
+       \gdef\UTFviiiTmp{#2}%
+    \endgroup}
+
+  \gdef\parseXMLCharref{%
+    \ifnum\countUTFz < "A0\relax
+      \errhelp = \EMsimple
+      \errmessage{Cannot define Unicode char value < 00A0}%
+    \else\ifnum\countUTFz < "800\relax
+      \parseUTFviiiA,%
+      \parseUTFviiiB C\UTFviiiTwoOctets.,%
+    \else\ifnum\countUTFz < "10000\relax
+      \parseUTFviiiA;%
+      \parseUTFviiiA,%
+      \parseUTFviiiB E\UTFviiiThreeOctets.{,;}%
+    \else
+      \parseUTFviiiA;%
+      \parseUTFviiiA,%
+      \parseUTFviiiA!%
+      \parseUTFviiiB F\UTFviiiFourOctets.{!,;}%
+    \fi\fi\fi
+  }
+
+  \gdef\parseUTFviiiA#1{%
+    \countUTFx = \countUTFz
+    \divide\countUTFz by 64
+    \countUTFy = \countUTFz
+    \multiply\countUTFz by 64
+    \advance\countUTFx by -\countUTFz
+    \advance\countUTFx by 128
+    \uccode `#1\countUTFx
+    \countUTFz = \countUTFy}
+
+  \gdef\parseUTFviiiB#1#2#3#4{%
+    \advance\countUTFz by "#10\relax
+    \uccode `#3\countUTFz
+    \uppercase{\gdef\UTFviiiTmp{#2#3#4}}}
+\endgroup
+
+\def\utfeightchardefs{%
+  \DeclareUnicodeCharacter{00A0}{\tie}
+  \DeclareUnicodeCharacter{00A1}{\exclamdown}
+  \DeclareUnicodeCharacter{00A3}{\pounds}
+  \DeclareUnicodeCharacter{00A8}{\"{ }}
+  \DeclareUnicodeCharacter{00A9}{\copyright}
+  \DeclareUnicodeCharacter{00AA}{\ordf}
+  \DeclareUnicodeCharacter{00AD}{\-}
+  \DeclareUnicodeCharacter{00AE}{\registeredsymbol}
+  \DeclareUnicodeCharacter{00AF}{\={ }}
+
+  \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}
+  \DeclareUnicodeCharacter{00B4}{\'{ }}
+  \DeclareUnicodeCharacter{00B8}{\cedilla{ }}
+  \DeclareUnicodeCharacter{00BA}{\ordm}
+  \DeclareUnicodeCharacter{00BF}{\questiondown}
+
+  \DeclareUnicodeCharacter{00C0}{\`A}
+  \DeclareUnicodeCharacter{00C1}{\'A}
+  \DeclareUnicodeCharacter{00C2}{\^A}
+  \DeclareUnicodeCharacter{00C3}{\~A}
+  \DeclareUnicodeCharacter{00C4}{\"A}
+  \DeclareUnicodeCharacter{00C5}{\AA}
+  \DeclareUnicodeCharacter{00C6}{\AE}
+  \DeclareUnicodeCharacter{00C7}{\cedilla{C}}
+  \DeclareUnicodeCharacter{00C8}{\`E}
+  \DeclareUnicodeCharacter{00C9}{\'E}
+  \DeclareUnicodeCharacter{00CA}{\^E}
+  \DeclareUnicodeCharacter{00CB}{\"E}
+  \DeclareUnicodeCharacter{00CC}{\`I}
+  \DeclareUnicodeCharacter{00CD}{\'I}
+  \DeclareUnicodeCharacter{00CE}{\^I}
+  \DeclareUnicodeCharacter{00CF}{\"I}
+
+  \DeclareUnicodeCharacter{00D1}{\~N}
+  \DeclareUnicodeCharacter{00D2}{\`O}
+  \DeclareUnicodeCharacter{00D3}{\'O}
+  \DeclareUnicodeCharacter{00D4}{\^O}
+  \DeclareUnicodeCharacter{00D5}{\~O}
+  \DeclareUnicodeCharacter{00D6}{\"O}
+  \DeclareUnicodeCharacter{00D8}{\O}
+  \DeclareUnicodeCharacter{00D9}{\`U}
+  \DeclareUnicodeCharacter{00DA}{\'U}
+  \DeclareUnicodeCharacter{00DB}{\^U}
+  \DeclareUnicodeCharacter{00DC}{\"U}
+  \DeclareUnicodeCharacter{00DD}{\'Y}
+  \DeclareUnicodeCharacter{00DF}{\ss}
+
+  \DeclareUnicodeCharacter{00E0}{\`a}
+  \DeclareUnicodeCharacter{00E1}{\'a}
+  \DeclareUnicodeCharacter{00E2}{\^a}
+  \DeclareUnicodeCharacter{00E3}{\~a}
+  \DeclareUnicodeCharacter{00E4}{\"a}
+  \DeclareUnicodeCharacter{00E5}{\aa}
+  \DeclareUnicodeCharacter{00E6}{\ae}
+  \DeclareUnicodeCharacter{00E7}{\cedilla{c}}
+  \DeclareUnicodeCharacter{00E8}{\`e}
+  \DeclareUnicodeCharacter{00E9}{\'e}
+  \DeclareUnicodeCharacter{00EA}{\^e}
+  \DeclareUnicodeCharacter{00EB}{\"e}
+  \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}
+  \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}
+  \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}
+  \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}
+
+  \DeclareUnicodeCharacter{00F1}{\~n}
+  \DeclareUnicodeCharacter{00F2}{\`o}
+  \DeclareUnicodeCharacter{00F3}{\'o}
+  \DeclareUnicodeCharacter{00F4}{\^o}
+  \DeclareUnicodeCharacter{00F5}{\~o}
+  \DeclareUnicodeCharacter{00F6}{\"o}
+  \DeclareUnicodeCharacter{00F8}{\o}
+  \DeclareUnicodeCharacter{00F9}{\`u}
+  \DeclareUnicodeCharacter{00FA}{\'u}
+  \DeclareUnicodeCharacter{00FB}{\^u}
+  \DeclareUnicodeCharacter{00FC}{\"u}
+  \DeclareUnicodeCharacter{00FD}{\'y}
+  \DeclareUnicodeCharacter{00FF}{\"y}
+
+  \DeclareUnicodeCharacter{0100}{\=A}
+  \DeclareUnicodeCharacter{0101}{\=a}
+  \DeclareUnicodeCharacter{0102}{\u{A}}
+  \DeclareUnicodeCharacter{0103}{\u{a}}
+  \DeclareUnicodeCharacter{0106}{\'C}
+  \DeclareUnicodeCharacter{0107}{\'c}
+  \DeclareUnicodeCharacter{0108}{\^C}
+  \DeclareUnicodeCharacter{0109}{\^c}
+  \DeclareUnicodeCharacter{010A}{\dotaccent{C}}
+  \DeclareUnicodeCharacter{010B}{\dotaccent{c}}
+  \DeclareUnicodeCharacter{010C}{\v{C}}
+  \DeclareUnicodeCharacter{010D}{\v{c}}
+  \DeclareUnicodeCharacter{010E}{\v{D}}
+
+  \DeclareUnicodeCharacter{0112}{\=E}
+  \DeclareUnicodeCharacter{0113}{\=e}
+  \DeclareUnicodeCharacter{0114}{\u{E}}
+  \DeclareUnicodeCharacter{0115}{\u{e}}
+  \DeclareUnicodeCharacter{0116}{\dotaccent{E}}
+  \DeclareUnicodeCharacter{0117}{\dotaccent{e}}
+  \DeclareUnicodeCharacter{011A}{\v{E}}
+  \DeclareUnicodeCharacter{011B}{\v{e}}
+  \DeclareUnicodeCharacter{011C}{\^G}
+  \DeclareUnicodeCharacter{011D}{\^g}
+  \DeclareUnicodeCharacter{011E}{\u{G}}
+  \DeclareUnicodeCharacter{011F}{\u{g}}
+
+  \DeclareUnicodeCharacter{0120}{\dotaccent{G}}
+  \DeclareUnicodeCharacter{0121}{\dotaccent{g}}
+  \DeclareUnicodeCharacter{0124}{\^H}
+  \DeclareUnicodeCharacter{0125}{\^h}
+  \DeclareUnicodeCharacter{0128}{\~I}
+  \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}
+  \DeclareUnicodeCharacter{012A}{\=I}
+  \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}
+  \DeclareUnicodeCharacter{012C}{\u{I}}
+  \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}
+
+  \DeclareUnicodeCharacter{0130}{\dotaccent{I}}
+  \DeclareUnicodeCharacter{0131}{\dotless{i}}
+  \DeclareUnicodeCharacter{0132}{IJ}
+  \DeclareUnicodeCharacter{0133}{ij}
+  \DeclareUnicodeCharacter{0134}{\^J}
+  \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}
+  \DeclareUnicodeCharacter{0139}{\'L}
+  \DeclareUnicodeCharacter{013A}{\'l}
+
+  \DeclareUnicodeCharacter{0141}{\L}
+  \DeclareUnicodeCharacter{0142}{\l}
+  \DeclareUnicodeCharacter{0143}{\'N}
+  \DeclareUnicodeCharacter{0144}{\'n}
+  \DeclareUnicodeCharacter{0147}{\v{N}}
+  \DeclareUnicodeCharacter{0148}{\v{n}}
+  \DeclareUnicodeCharacter{014C}{\=O}
+  \DeclareUnicodeCharacter{014D}{\=o}
+  \DeclareUnicodeCharacter{014E}{\u{O}}
+  \DeclareUnicodeCharacter{014F}{\u{o}}
+
+  \DeclareUnicodeCharacter{0150}{\H{O}}
+  \DeclareUnicodeCharacter{0151}{\H{o}}
+  \DeclareUnicodeCharacter{0152}{\OE}
+  \DeclareUnicodeCharacter{0153}{\oe}
+  \DeclareUnicodeCharacter{0154}{\'R}
+  \DeclareUnicodeCharacter{0155}{\'r}
+  \DeclareUnicodeCharacter{0158}{\v{R}}
+  \DeclareUnicodeCharacter{0159}{\v{r}}
+  \DeclareUnicodeCharacter{015A}{\'S}
+  \DeclareUnicodeCharacter{015B}{\'s}
+  \DeclareUnicodeCharacter{015C}{\^S}
+  \DeclareUnicodeCharacter{015D}{\^s}
+  \DeclareUnicodeCharacter{015E}{\cedilla{S}}
+  \DeclareUnicodeCharacter{015F}{\cedilla{s}}
+
+  \DeclareUnicodeCharacter{0160}{\v{S}}
+  \DeclareUnicodeCharacter{0161}{\v{s}}
+  \DeclareUnicodeCharacter{0162}{\cedilla{t}}
+  \DeclareUnicodeCharacter{0163}{\cedilla{T}}
+  \DeclareUnicodeCharacter{0164}{\v{T}}
+
+  \DeclareUnicodeCharacter{0168}{\~U}
+  \DeclareUnicodeCharacter{0169}{\~u}
+  \DeclareUnicodeCharacter{016A}{\=U}
+  \DeclareUnicodeCharacter{016B}{\=u}
+  \DeclareUnicodeCharacter{016C}{\u{U}}
+  \DeclareUnicodeCharacter{016D}{\u{u}}
+  \DeclareUnicodeCharacter{016E}{\ringaccent{U}}
+  \DeclareUnicodeCharacter{016F}{\ringaccent{u}}
+
+  \DeclareUnicodeCharacter{0170}{\H{U}}
+  \DeclareUnicodeCharacter{0171}{\H{u}}
+  \DeclareUnicodeCharacter{0174}{\^W}
+  \DeclareUnicodeCharacter{0175}{\^w}
+  \DeclareUnicodeCharacter{0176}{\^Y}
+  \DeclareUnicodeCharacter{0177}{\^y}
+  \DeclareUnicodeCharacter{0178}{\"Y}
+  \DeclareUnicodeCharacter{0179}{\'Z}
+  \DeclareUnicodeCharacter{017A}{\'z}
+  \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}
+  \DeclareUnicodeCharacter{017C}{\dotaccent{z}}
+  \DeclareUnicodeCharacter{017D}{\v{Z}}
+  \DeclareUnicodeCharacter{017E}{\v{z}}
+
+  \DeclareUnicodeCharacter{01C4}{D\v{Z}}
+  \DeclareUnicodeCharacter{01C5}{D\v{z}}
+  \DeclareUnicodeCharacter{01C6}{d\v{z}}
+  \DeclareUnicodeCharacter{01C7}{LJ}
+  \DeclareUnicodeCharacter{01C8}{Lj}
+  \DeclareUnicodeCharacter{01C9}{lj}
+  \DeclareUnicodeCharacter{01CA}{NJ}
+  \DeclareUnicodeCharacter{01CB}{Nj}
+  \DeclareUnicodeCharacter{01CC}{nj}
+  \DeclareUnicodeCharacter{01CD}{\v{A}}
+  \DeclareUnicodeCharacter{01CE}{\v{a}}
+  \DeclareUnicodeCharacter{01CF}{\v{I}}
+
+  \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}
+  \DeclareUnicodeCharacter{01D1}{\v{O}}
+  \DeclareUnicodeCharacter{01D2}{\v{o}}
+  \DeclareUnicodeCharacter{01D3}{\v{U}}
+  \DeclareUnicodeCharacter{01D4}{\v{u}}
+
+  \DeclareUnicodeCharacter{01E2}{\={\AE}}
+  \DeclareUnicodeCharacter{01E3}{\={\ae}}
+  \DeclareUnicodeCharacter{01E6}{\v{G}}
+  \DeclareUnicodeCharacter{01E7}{\v{g}}
+  \DeclareUnicodeCharacter{01E8}{\v{K}}
+  \DeclareUnicodeCharacter{01E9}{\v{k}}
+
+  \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}
+  \DeclareUnicodeCharacter{01F1}{DZ}
+  \DeclareUnicodeCharacter{01F2}{Dz}
+  \DeclareUnicodeCharacter{01F3}{dz}
+  \DeclareUnicodeCharacter{01F4}{\'G}
+  \DeclareUnicodeCharacter{01F5}{\'g}
+  \DeclareUnicodeCharacter{01F8}{\`N}
+  \DeclareUnicodeCharacter{01F9}{\`n}
+  \DeclareUnicodeCharacter{01FC}{\'{\AE}}
+  \DeclareUnicodeCharacter{01FD}{\'{\ae}}
+  \DeclareUnicodeCharacter{01FE}{\'{\O}}
+  \DeclareUnicodeCharacter{01FF}{\'{\o}}
+
+  \DeclareUnicodeCharacter{021E}{\v{H}}
+  \DeclareUnicodeCharacter{021F}{\v{h}}
+
+  \DeclareUnicodeCharacter{0226}{\dotaccent{A}}
+  \DeclareUnicodeCharacter{0227}{\dotaccent{a}}
+  \DeclareUnicodeCharacter{0228}{\cedilla{E}}
+  \DeclareUnicodeCharacter{0229}{\cedilla{e}}
+  \DeclareUnicodeCharacter{022E}{\dotaccent{O}}
+  \DeclareUnicodeCharacter{022F}{\dotaccent{o}}
+
+  \DeclareUnicodeCharacter{0232}{\=Y}
+  \DeclareUnicodeCharacter{0233}{\=y}
+  \DeclareUnicodeCharacter{0237}{\dotless{j}}
+
+  \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}
+  \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}
+  \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}
+  \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}
+  \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}
+  \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}
+  \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}
+  \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}
+  \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}
+  \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}
+  \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}
+  \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}
+
+  \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}
+  \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}
+
+  \DeclareUnicodeCharacter{1E20}{\=G}
+  \DeclareUnicodeCharacter{1E21}{\=g}
+  \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}
+  \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}
+  \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}
+  \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}
+  \DeclareUnicodeCharacter{1E26}{\"H}
+  \DeclareUnicodeCharacter{1E27}{\"h}
+
+  \DeclareUnicodeCharacter{1E30}{\'K}
+  \DeclareUnicodeCharacter{1E31}{\'k}
+  \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}
+  \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}
+  \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}
+  \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}
+  \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}
+  \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}
+  \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}
+  \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}
+  \DeclareUnicodeCharacter{1E3E}{\'M}
+  \DeclareUnicodeCharacter{1E3F}{\'m}
+
+  \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}
+  \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}
+  \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}
+  \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}
+  \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}
+  \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}
+  \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}
+  \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}
+  \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}
+  \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}
+
+  \DeclareUnicodeCharacter{1E54}{\'P}
+  \DeclareUnicodeCharacter{1E55}{\'p}
+  \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}
+  \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}
+  \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}
+  \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}
+  \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}
+  \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}
+  \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}
+  \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}
+
+  \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}
+  \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}
+  \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}
+  \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}
+  \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}
+  \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}
+  \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}
+  \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}
+  \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}
+  \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}
+
+  \DeclareUnicodeCharacter{1E7C}{\~V}
+  \DeclareUnicodeCharacter{1E7D}{\~v}
+  \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}
+  \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}
+
+  \DeclareUnicodeCharacter{1E80}{\`W}
+  \DeclareUnicodeCharacter{1E81}{\`w}
+  \DeclareUnicodeCharacter{1E82}{\'W}
+  \DeclareUnicodeCharacter{1E83}{\'w}
+  \DeclareUnicodeCharacter{1E84}{\"W}
+  \DeclareUnicodeCharacter{1E85}{\"w}
+  \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}
+  \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}
+  \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}
+  \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}
+  \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}
+  \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}
+  \DeclareUnicodeCharacter{1E8C}{\"X}
+  \DeclareUnicodeCharacter{1E8D}{\"x}
+  \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}
+  \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}
+
+  \DeclareUnicodeCharacter{1E90}{\^Z}
+  \DeclareUnicodeCharacter{1E91}{\^z}
+  \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}
+  \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}
+  \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}
+  \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}
+  \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}
+  \DeclareUnicodeCharacter{1E97}{\"t}
+  \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}
+  \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}
+
+  \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}
+  \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}
+
+  \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}
+  \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}
+  \DeclareUnicodeCharacter{1EBC}{\~E}
+  \DeclareUnicodeCharacter{1EBD}{\~e}
+
+  \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}
+  \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}
+  \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}
+  \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}
+
+  \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}
+  \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}
+
+  \DeclareUnicodeCharacter{1EF2}{\`Y}
+  \DeclareUnicodeCharacter{1EF3}{\`y}
+  \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}
+
+  \DeclareUnicodeCharacter{1EF8}{\~Y}
+  \DeclareUnicodeCharacter{1EF9}{\~y}
+
+  \DeclareUnicodeCharacter{2013}{--}
+  \DeclareUnicodeCharacter{2014}{---}
+  \DeclareUnicodeCharacter{2022}{\bullet}
+  \DeclareUnicodeCharacter{2026}{\dots}
+  \DeclareUnicodeCharacter{20AC}{\euro}
+
+  \DeclareUnicodeCharacter{2192}{\expansion}
+  \DeclareUnicodeCharacter{21D2}{\result}
+
+  \DeclareUnicodeCharacter{2212}{\minus}
+  \DeclareUnicodeCharacter{2217}{\point}
+  \DeclareUnicodeCharacter{2261}{\equiv}
+}% end of \utfeightchardefs
+
+
+% US-ASCII character definitions.
+\def\asciichardefs{% nothing need be done
+   \relax
+}
+
+% Make non-ASCII characters printable again for compatibility with
+% existing Texinfo documents that may use them, even without declaring a
+% document encoding.
+%
+\setnonasciicharscatcode \other
+
+
+\message{formatting,}
 
-% Page size parameters.
-%
 \newdimen\defaultparindent \defaultparindent = 15pt
 
 \chapheadingskip = 15pt plus 4pt minus 2pt
@@ -6437,9 +8284,9 @@ should work if nowhere else does.}
   \fi
 }
 
-% Parameters in order: 1) textheight; 2) textwidth; 3) voffset;
-% 4) hoffset; 5) binding offset; 6) topskip; 7) physical page height; 8)
-% physical page width.
+% Parameters in order: 1) textheight; 2) textwidth;
+% 3) voffset; 4) hoffset; 5) binding offset; 6) topskip;
+% 7) physical page height; 8) physical page width.
 %
 % We also call \setleading{\textleading}, so the caller should define
 % \textleading.  The caller should also set \parskip.
@@ -6486,7 +8333,7 @@ should work if nowhere else does.}
                     {11in}{8.5in}%
 }}
 
-% Use @smallbook to reset parameters for 7x9.5 (or so) format.
+% Use @smallbook to reset parameters for 7x9.25 trim size.
 \def\smallbook{{\globaldefs = 1
   \parskip = 2pt plus 1pt
   \textleading = 12pt
@@ -6503,6 +8350,24 @@ should work if nowhere else does.}
   \defbodyindent = .5cm
 }}
 
+% Use @smallerbook to reset parameters for 6x9 trim size.
+% (Just testing, parameters still in flux.)
+\def\smallerbook{{\globaldefs = 1
+  \parskip = 1.5pt plus 1pt
+  \textleading = 12pt
+  %
+  \internalpagesizes{7.4in}{4.8in}%
+                    {-.2in}{-.4in}%
+                    {0pt}{14pt}%
+                    {9in}{6in}%
+  %
+  \lispnarrowing = 0.25in
+  \tolerance = 700
+  \hfuzz = 1pt
+  \contentsrightmargin = 0pt
+  \defbodyindent = .4cm
+}}
+
 % Use @afourpaper to print on European A4 paper.
 \def\afourpaper{{\globaldefs = 1
   \parskip = 3pt plus 2pt minus 1pt
@@ -6575,8 +8440,7 @@ should work if nowhere else does.}
 % Perhaps we should allow setting the margins, \topskip, \parskip,
 % and/or leading, also. Or perhaps we should compute them somehow.
 %
-\def\pagesizes{\parsearg\pagesizesxxx}
-\def\pagesizesxxx#1{\pagesizesyyy #1,,\finish}
+\parseargdef\pagesizes{\pagesizesyyy #1,,\finish}
 \def\pagesizesyyy#1,#2,#3\finish{{%
   \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \hsize=#2\relax \fi
   \globaldefs = 1
@@ -6623,8 +8487,8 @@ should work if nowhere else does.}
 \def\normalplus{+}
 \def\normaldollar{$}%$ font-lock fix
 
-% This macro is used to make a character print one way in ttfont
-% where it can probably just be output, and another way in other fonts,
+% This macro is used to make a character print one way in \tt
+% (where it can probably be output as-is), and another way in other fonts,
 % where something hairier probably needs to be done.
 %
 % #1 is what to print if we are indeed using \tt; #2 is what to print
@@ -6656,6 +8520,7 @@ should work if nowhere else does.}
 
 \catcode`\_=\active
 \def_{\ifusingtt\normalunderscore\_}
+\let\realunder=_
 % Subroutine for the previous macro.
 \def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }
 
@@ -6672,46 +8537,49 @@ should work if nowhere else does.}
 \catcode`\$=\active
 \def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix
 
-% Set up an active definition for =, but don't enable it most of the time.
-{\catcode`\==\active
-\global\def={{\tt \char 61}}}
-
-\catcode`+=\active
-\catcode`\_=\active
-
 % If a .fmt file is being used, characters that might appear in a file
 % name cannot be active until we have parsed the command line.
 % So turn them off again, and have \everyjob (or @setfilename) turn them on.
 % \otherifyactive is called near the end of this file.
 \def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
 
+% Used sometimes to turn off (effectively) the active characters even after
+% parsing them.
+\def\turnoffactive{%
+  \normalturnoffactive
+  \otherbackslash
+}
+
 \catcode`\@=0
 
-% \rawbackslashxx outputs one backslash character in current font,
+% \backslashcurfont outputs one backslash character in current font,
 % as in \char`\\.
-\global\chardef\rawbackslashxx=`\\
-
-% \rawbackslash defines an active \ to do \rawbackslashxx.
-% \otherbackslash defines an active \ to be a literal `\' character with
-% catcode other.
-{\catcode`\\=\active
- @gdef@rawbackslash{@let\=@rawbackslashxx}
- @gdef@otherbackslash{@let\=@realbackslash}
-}
+\global\chardef\backslashcurfont=`\\
+\global\let\rawbackslashxx=\backslashcurfont  % let existing .??s files work
 
-% \realbackslash is an actual character `\' with catcode other.
-{\catcode`\\=\other @gdef@realbackslash{\}}
-
-% \normalbackslash outputs one backslash in fixed width font.
-\def\normalbackslash{{\tt\rawbackslashxx}}
+% \realbackslash is an actual character `\' with catcode other, and
+% \doublebackslash is two of them (for the pdf outlines).
+{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}}
 
+% In texinfo, backslash is an active character; it prints the backslash
+% in fixed width font.
 \catcode`\\=\active
+@def@normalbackslash{{@tt@backslashcurfont}}
+% On startup, @fixbackslash assigns:
+%  @let \ = @normalbackslash
+
+% \rawbackslash defines an active \ to do \backslashcurfont.
+% \otherbackslash defines an active \ to be a literal `\' character with
+% catcode other.
+@gdef@rawbackslash{@let\=@backslashcurfont}
+@gdef@otherbackslash{@let\=@realbackslash}
 
-% Used sometimes to turn off (effectively) the active characters
-% even after parsing them.
-@def@turnoffactive{%
+% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
+% the literal character `\'.
+% 
+@def@normalturnoffactive{%
+  @let\=@normalbackslash
   @let"=@normaldoublequote
-  @let\=@realbackslash
   @let~=@normaltilde
   @let^=@normalcaret
   @let_=@normalunderscore
@@ -6720,14 +8588,9 @@ should work if nowhere else does.}
   @let>=@normalgreater
   @let+=@normalplus
   @let$=@normaldollar %$ font-lock fix
+  @unsepspaces
 }
 
-% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-% the literal character `\'.  (Thus, \ is not expandable when this is in
-% effect.)
-%
-@def@normalturnoffactive{@turnoffactive @let\=@normalbackslash}
-
 % Make _ and + \other characters, temporarily.
 % This is canceled by @fixbackslash.
 @otherifyactive
@@ -6740,9 +8603,9 @@ should work if nowhere else does.}
 @global@let\ = @eatinput
 
 % On the other hand, perhaps the file did not have a `\input texinfo'. Then
-% the first `\{ in the file would cause an error. This macro tries to fix
+% the first `\' in the file would cause an error. This macro tries to fix
 % that, assuming it is called before the first `\' could plausibly occur.
-% Also back turn on active characters that might appear in the input
+% Also turn back on active characters that might appear in the input
 % file name, in case not using a pre-dumped format.
 %
 @gdef@fixbackslash{%
@@ -6759,10 +8622,6 @@ should work if nowhere else does.}
 @catcode`@# = @other
 @catcode`@% = @other
 
-@c Set initial fonts.
-@textfonts
-@rm
-
 
 @c Local variables:
 @c eval: (add-hook 'write-file-hooks 'time-stamp)
@@ -6771,3 +8630,9 @@ should work if nowhere else does.}
 @c time-stamp-format: "%:y-%02m-%02d.%02H"
 @c time-stamp-end: "}"
 @c End:
+
+@c vim:sw=2:
+
+@ignore
+   arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115
+@end ignore
diff --git a/scripts/w32installer.nsi b/scripts/w32installer.nsi
index 5a8c668c4..327182d5b 100644
--- a/scripts/w32installer.nsi
+++ b/scripts/w32installer.nsi
@@ -43,12 +43,11 @@ VIAddVersionKey "Comments" \
    "GnuPG is Free Software; you can redistribute it and/or modify  \
     it under the terms of the GNU General Public License. You should  \
     have received a copy of the GNU General Public License along with  \
-    this software; if not, write to the Free Software Foundation, Inc.,  \
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
+    this software; if not, see <http://www.gnu.org/licenses/>."
 VIAddVersionKey "CompanyName" "Free Software Foundation"
 VIAddVersionKey "LegalTrademarks" ""
 VIAddVersionKey "LegalCopyright" \
-    "Copyright (C) 2005 Free Software Foundation, Inc."
+    "Copyright (C) 2007 Free Software Foundation, Inc."
 VIAddVersionKey "FileDescription" \
     "GnuPG: Encryption and digital signature tool"
 VIAddVersionKey "FileVersion" "${PROD_VERSION}"
diff --git a/tools/ChangeLog b/tools/ChangeLog
index f62c68ac3..c2a5fba6a 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-23  Werner Koch  <[email protected]>
+
+	Switched entire package to GPLv3+.
+
 2007-04-16  David Shaw  <[email protected]>
 
 	* Makefile.am (noinst_PROGRAMS): Don't build shmtest unless we
@@ -225,7 +229,7 @@ Tue Apr  7 19:50:41 1998  Werner Koch  ([email protected])
 
 
 
- Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright 1998, 1999, 2000, 2001, 2007 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d90009205..0c6e691dc 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -5,7 +5,7 @@
 #
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
 # 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
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = lspgpot ring-a-party mail-signed-keys convert-from-106
diff --git a/tools/bftest.c b/tools/bftest.c
index 73a1196ae..8a1572c2b 100644
--- a/tools/bftest.c
+++ b/tools/bftest.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/tools/convert-from-106 b/tools/convert-from-106
index 634152b11..173793be1 100755
--- a/tools/convert-from-106
+++ b/tools/convert-from-106
@@ -3,7 +3,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -12,9 +12,7 @@
 # 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 if ! gpg --version > /dev/null 2>&1 ; then
    echo "GnuPG not available!"
    exit 1
diff --git a/tools/gpg-zip.in b/tools/gpg-zip.in
index 8b4ccfb2b..d27b1f962 100644
--- a/tools/gpg-zip.in
+++ b/tools/gpg-zip.in
@@ -7,7 +7,7 @@
 #
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GnuPG is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
 # 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
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 # Despite the name, PGP Zip format is actually an OpenPGP-wrapped tar
 # file.  To be compatible with PGP itself, this must be a USTAR format
 # tar file.  Unclear on whether there is a distinction here between
diff --git a/tools/gpgsplit.c b/tools/gpgsplit.c
index 3cdae05bf..5058106a7 100644
--- a/tools/gpgsplit.c
+++ b/tools/gpgsplit.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* 
diff --git a/tools/make-dns-cert.c b/tools/make-dns-cert.c
index 496b63b0b..31314edc9 100644
--- a/tools/make-dns-cert.c
+++ b/tools/make-dns-cert.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/tools/mpicalc.c b/tools/mpicalc.c
index 1df27d9d3..8cfde49b5 100644
--- a/tools/mpicalc.c
+++ b/tools/mpicalc.c
@@ -11,7 +11,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -20,9 +20,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/tools/pgpgroup-to-gpggroup b/tools/pgpgroup-to-gpggroup
index 5ea9990b6..dbf854c9e 100755
--- a/tools/pgpgroup-to-gpggroup
+++ b/tools/pgpgroup-to-gpggroup
@@ -5,7 +5,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -14,9 +14,7 @@
 # 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 # This program requires a PGP command line program that supports
 # groups (note that the PGP 8 command line doesn't).
 
diff --git a/util/ChangeLog b/util/ChangeLog
index 189ab6de3..2d5e40006 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-23  Werner Koch  <[email protected]>
+
+	Switched entire package to GPLv3+.  The parts taken from libassuan
+	and glibc are kept at LGPLv2+; only the address as been chnaged.
+
+	* argparse.c (strusage): Use id 10 for the license string;
+	defaults to GPL3+.  Change long note to version 3 or later.
+	(show_version): Print the license info.
+
 2007-08-24  Werner Koch  <[email protected]>
 
 	* fileutil.c (same_file_p): New.  Taken from SVN trunk.
diff --git a/util/Makefile.am b/util/Makefile.am
index 1da5a1075..60d287ac2 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -4,7 +4,7 @@
 #
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # GnuPG is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
 # 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
-
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
diff --git a/util/argparse.c b/util/argparse.c
index cd29c0cef..601f6660e 100644
--- a/util/argparse.c
+++ b/util/argparse.c
@@ -1,25 +1,21 @@
 /* [argparse.c wk 17.06.97] Argument Parser for option handling
- *  Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
- *                2007 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+ *               2007 Free Software Foundation, Inc.
  *
- *  This file is part of GnuPG.
+ * This file is part of GnuPG.
  *
- *  GnuPG is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ * GnuPG is 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 3 of the License, or
+ * (at your option) any later version.
  *
- *  GnuPG is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- *
- * Note: This is an independent version of the one in WkLib
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -857,6 +853,9 @@ show_version()
     /* copyright string */
     if( (s=strusage(14)) )
 	printf("%s\n", s );
+    /* Licence string.  */
+    if( (s=strusage (10)) )
+        printf("%s\n", s );
     /* copying conditions */
     if( (s=strusage(15)) )
 	fputs(s, stdout);
@@ -893,6 +892,7 @@ usage( int level )
  *     0: Copyright String auf stderr ausgeben
  *     1: Kurzusage auf stderr ausgeben und beenden
  *     2: Langusage auf stdout ausgeben und beenden
+ *    10: Return license info string
  *    11: name of program
  *    12: optional name of package which includes this program.
  *    13: version  string
@@ -912,25 +912,27 @@ default_strusage( int level )
 {
     const char *p = NULL;
     switch( level ) {
+      case 10: p = ("License GPLv3+: GNU GPL version 3 or later "
+                    "<http://gnu.org/licenses/gpl.html>");
+        break;
       case 11: p = "foo"; break;
       case 13: p = "0.0"; break;
       case 14: p = "Copyright (C) 2007 Free Software Foundation, Inc."; break;
       case 15: p =
-"This program comes with ABSOLUTELY NO WARRANTY.\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions. See the file COPYING for details.\n"; break;
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"; 
+        break;
       case 16:	p =
 "This is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
+"the Free Software Foundation; either version 3 of the License, or\n"
 "(at your option) any later version.\n\n"
 "It is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
 "GNU General Public License for more details.\n\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n";
+"along with this software.  If not, see <http://www.gnu.org/licenses/>.\n";
 	break;
       case 40: /* short and long usage */
       case 41: p = ""; break;
diff --git a/util/assuan-buffer.c b/util/assuan-buffer.c
index 3c0108601..d8f5d100e 100644
--- a/util/assuan-buffer.c
+++ b/util/assuan-buffer.c
@@ -13,10 +13,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser 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. 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/assuan-client.c b/util/assuan-client.c
index 0467f6dc5..edaa2c71e 100644
--- a/util/assuan-client.c
+++ b/util/assuan-client.c
@@ -14,10 +14,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser 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. 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/assuan-connect.c b/util/assuan-connect.c
index 9952b4406..eff2b4909 100644
--- a/util/assuan-connect.c
+++ b/util/assuan-connect.c
@@ -13,10 +13,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser 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. 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/assuan-defs.h b/util/assuan-defs.h
index 67c4e13ce..775bdf048 100644
--- a/util/assuan-defs.h
+++ b/util/assuan-defs.h
@@ -14,10 +14,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser 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. 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/assuan-errors.c b/util/assuan-errors.c
index c3a8770cb..dad5e0ff7 100644
--- a/util/assuan-errors.c
+++ b/util/assuan-errors.c
@@ -14,10 +14,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser 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. 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/assuan-logging.c b/util/assuan-logging.c
index f2d6c876d..692e98206 100644
--- a/util/assuan-logging.c
+++ b/util/assuan-logging.c
@@ -13,10 +13,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser 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. 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/assuan-socket-connect.c b/util/assuan-socket-connect.c
index 0c580cd5f..886400e29 100644
--- a/util/assuan-socket-connect.c
+++ b/util/assuan-socket-connect.c
@@ -13,10 +13,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser 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. 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/assuan-socket.c b/util/assuan-socket.c
index 4d79792ce..8eb3febcb 100644
--- a/util/assuan-socket.c
+++ b/util/assuan-socket.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/assuan-util.c b/util/assuan-util.c
index db3cb7232..72558210e 100644
--- a/util/assuan-util.c
+++ b/util/assuan-util.c
@@ -14,10 +14,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser 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. 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Please note that this is a stripped down and modified version of
diff --git a/util/cert.c b/util/cert.c
index 317c14b37..8bc924468 100644
--- a/util/cert.c
+++ b/util/cert.c
@@ -5,7 +5,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/util/dotlock.c b/util/dotlock.c
index 9edac57ed..8369af730 100644
--- a/util/dotlock.c
+++ b/util/dotlock.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/util/errors.c b/util/errors.c
index 75498f80e..37e0795d4 100644
--- a/util/errors.c
+++ b/util/errors.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/util/fileutil.c b/util/fileutil.c
index dc2722105..202b324d4 100644
--- a/util/fileutil.c
+++ b/util/fileutil.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/util/http.c b/util/http.c
index 95010526c..042e2fb49 100644
--- a/util/http.c
+++ b/util/http.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/util/iobuf.c b/util/iobuf.c
index f6e817c42..a52f00897 100644
--- a/util/iobuf.c
+++ b/util/iobuf.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/util/isascii.c b/util/isascii.c
index b71febe99..be14a3843 100644
--- a/util/isascii.c
+++ b/util/isascii.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/util/logger.c b/util/logger.c
index 857436c43..5e603d678 100644
--- a/util/logger.c
+++ b/util/logger.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/util/membuf.c b/util/membuf.c
index 44347fa1b..db3f5ac37 100644
--- a/util/membuf.c
+++ b/util/membuf.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/util/memory.c b/util/memory.c
index e16c3d8f7..55ac49e35 100644
--- a/util/memory.c
+++ b/util/memory.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *
  * We use our own memory allocation functions instead of plain malloc(),
diff --git a/util/memrchr.c b/util/memrchr.c
index 5621f7323..f4e704f47 100644
--- a/util/memrchr.c
+++ b/util/memrchr.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/util/miscutil.c b/util/miscutil.c
index 01241bc23..30129634c 100644
--- a/util/miscutil.c
+++ b/util/miscutil.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/util/mkdtemp.c b/util/mkdtemp.c
index c0ee0bbdb..e2d3af8c2 100644
--- a/util/mkdtemp.c
+++ b/util/mkdtemp.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This is a replacement function for mkdtemp in case the platform
diff --git a/util/pka.c b/util/pka.c
index 2a39a4feb..901bfb6c4 100644
--- a/util/pka.c
+++ b/util/pka.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/util/regcomp.c b/util/regcomp.c
index 766339945..6964df93e 100644
--- a/util/regcomp.c
+++ b/util/regcomp.c
@@ -13,10 +13,9 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02110-1301 USA.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. 
+*/
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/util/regex.c b/util/regex.c
index 34d412002..723733f3e 100644
--- a/util/regex.c
+++ b/util/regex.c
@@ -13,10 +13,9 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02110-1301 USA.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. 
+*/
 
 #ifdef _LIBC
 /* We have to keep the namespace clean.  */
diff --git a/util/regex_internal.c b/util/regex_internal.c
index 0f8b897b1..6f3a96e7d 100644
--- a/util/regex_internal.c
+++ b/util/regex_internal.c
@@ -13,10 +13,9 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02110-1301 USA.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. 
+*/
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/util/regex_internal.h b/util/regex_internal.h
index 679bea11b..1fbd0d608 100644
--- a/util/regex_internal.h
+++ b/util/regex_internal.h
@@ -13,10 +13,9 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02110-1301 USA.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. 
+*/
 
 #ifndef _REGEX_INTERNAL_H
 #define _REGEX_INTERNAL_H 1
diff --git a/util/regexec.c b/util/regexec.c
index 40d305899..bcdd51563 100644
--- a/util/regexec.c
+++ b/util/regexec.c
@@ -13,10 +13,9 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02110-1301 USA.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. 
+*/
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/util/riscos.c b/util/riscos.c
index b94ff5318..814ec695e 100644
--- a/util/riscos.c
+++ b/util/riscos.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __RISCOS__C__
diff --git a/util/secmem.c b/util/secmem.c
index 5a4affd42..f54c3a5b4 100644
--- a/util/secmem.c
+++ b/util/secmem.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/util/simple-gettext.c b/util/simple-gettext.c
index f1f504a71..9225737a7 100644
--- a/util/simple-gettext.c
+++ b/util/simple-gettext.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This is a simplified version of gettext written by Ulrich Drepper.
diff --git a/util/srv.c b/util/srv.c
index 1cbc52eb6..6b6e2116f 100644
--- a/util/srv.c
+++ b/util/srv.c
@@ -5,7 +5,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/util/srv.h b/util/srv.h
index a81ebd573..fdd568a5f 100644
--- a/util/srv.h
+++ b/util/srv.h
@@ -5,7 +5,7 @@
  *
  * GNUPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GNUPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _SRV_H_
diff --git a/util/strgutil.c b/util/strgutil.c
index 9d2b15994..f19bab590 100644
--- a/util/strgutil.c
+++ b/util/strgutil.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/util/timegm.c b/util/timegm.c
index 3b7931e7c..430bb7f58 100644
--- a/util/timegm.c
+++ b/util/timegm.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/util/ttyio.c b/util/ttyio.c
index f763e6605..b60a9196a 100644
--- a/util/ttyio.c
+++ b/util/ttyio.c
@@ -6,7 +6,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/util/w32reg.c b/util/w32reg.c
index f65c9542c..c8c9703b3 100644
--- a/util/w32reg.c
+++ b/util/w32reg.c
@@ -5,7 +5,7 @@
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>