gnupg (43 files)

cvs user wk cvs at cvs.gnupg.org
Tue Dec 14 08:45:32 CET 2004


    Date: Tuesday, December 14, 2004 @ 08:49:27
  Author: wk
    Path: /cvs/gnupg/gnupg

Modified: AUTHORS ChangeLog INSTALL Makefile.am NEWS README configure.ac
          g10/ChangeLog g10/card-util.c g10/keyedit.c g10/keyserver.c
          keyserver/ChangeLog keyserver/Makefile.am po/be.po po/ca.po
          po/cs.po po/da.po po/de.po po/el.po po/eo.po po/es.po po/et.po
          po/fi.po po/fr.po po/gl.po po/hu.po po/id.po po/it.po po/ja.po
          po/pl.po po/pt.po po/pt_BR.po po/ro.po po/ru.po po/sk.po
          po/sv.po po/tr.po po/zh_CN.po po/zh_TW.po scripts/depcomp
          scripts/install-sh scripts/missing scripts/mkinstalldirs

Prepared for last 1.4 release candidate


-----------------------+
 AUTHORS               |   26 +
 ChangeLog             |   14 
 INSTALL               |   52 +-
 Makefile.am           |    2 
 NEWS                  |    9 
 README                |    4 
 configure.ac          |    4 
 g10/ChangeLog         |   26 -
 g10/card-util.c       |   41 -
 g10/keyedit.c         |   95 ++--
 g10/keyserver.c       |   15 
 keyserver/ChangeLog   |    5 
 keyserver/Makefile.am |    8 
 po/be.po              |  832 ++++++++++++++--------------------------
 po/ca.po              |  986 +++++++++++++++++++++--------------------------
 po/cs.po              |  986 ++++++++++++++++++++++-------------------------
 po/da.po              |  975 +++++++++++++++++++++--------------------------
 po/de.po              |  982 +++++++++++++++++++++--------------------------
 po/el.po              |  984 +++++++++++++++++++++--------------------------
 po/eo.po              |  988 ++++++++++++++++++++++-------------------------
 po/es.po              |  984 +++++++++++++++++++++--------------------------
 po/et.po              |  984 +++++++++++++++++++++--------------------------
 po/fi.po              |  984 +++++++++++++++++++++--------------------------
 po/fr.po              |  992 ++++++++++++++++++++++-------------------------
 po/gl.po              |  984 +++++++++++++++++++++--------------------------
 po/hu.po              |  984 +++++++++++++++++++++--------------------------
 po/id.po              |  984 +++++++++++++++++++++--------------------------
 po/it.po              |  984 +++++++++++++++++++++--------------------------
 po/ja.po              |  986 ++++++++++++++++++++++-------------------------
 po/pl.po              |  989 ++++++++++++++++++++++-------------------------
 po/pt.po              |  984 +++++++++++++++++++++--------------------------
 po/pt_BR.po           |  988 +++++++++++++++++++++--------------------------
 po/ro.po              |  984 +++++++++++++++++++++--------------------------
 po/ru.po              |  984 +++++++++++++++++++++--------------------------
 po/sk.po              |  984 +++++++++++++++++++++--------------------------
 po/sv.po              |  994 ++++++++++++++++++++++--------------------------
 po/tr.po              |  984 +++++++++++++++++++++--------------------------
 po/zh_CN.po           |  986 ++++++++++++++++++++++-------------------------
 po/zh_TW.po           |  984 +++++++++++++++++++++--------------------------
 scripts/depcomp       |   75 ++-
 scripts/install-sh    |  471 ++++++++++++----------
 scripts/missing       |  127 +++---
 scripts/mkinstalldirs |   69 ++-
 43 files changed, 12299 insertions(+), 14204 deletions(-)


Index: gnupg/AUTHORS
diff -u gnupg/AUTHORS:1.37 gnupg/AUTHORS:1.38
--- gnupg/AUTHORS:1.37	Wed Nov 17 17:04:21 2004
+++ gnupg/AUTHORS	Tue Dec 14 08:49:26 2004
@@ -7,11 +7,14 @@
 Authors
 =======
 
+Ales Nyakhaychyk <nyakhaychyk at i1fn.linux.by> Translations [be]
+
 Birger Langkjer <birger.langkjer at image.dk> Translations [da]
 
 Maxim Britov <maxbritov at tut.by> Translations [ru]
 
 Daniel Resare  <daniel at resare.com> Translations [sv]
+Per Tunedal    <per at clipanish.com> Translations [sv]
 
 David Shaw <dshaw at jabberwocky.com> Assigns past and future changes.
     (all in keyserver/,
@@ -25,12 +28,12 @@
 Florian Weimer	<fw at deneb.enyo.de>  Assigns past and future changes
     (changed:g10/parse-packet.c, include/iobuf.h, util/iobuf.c)
 
-Gaël Quéri  <gael at lautre.net>  Translations [fr]
+Gaël Quéri  <gael at lautre.net>  Translations [fr]
     (fixed a lot of typos)
 
 Gregory Steuck <steuck at iname.com> Translations [ru]
 
-Nagy Ferenc László <nfl at nfllab.com> Translations [hu]
+Nagy Ferenc László <nfl at nfllab.com> Translations [hu]
 
 Ivo Timmermans <itimmermans at bigfoot.com> Translations [nl]
 
@@ -38,11 +41,20 @@
 
 Janusz Aleksander Urbanowicz <alex at bofh.torun.pl> Translations [po]
 
+Jedi Lin <Jedi at idej.org> Translations [zh-tw]
+
+Jouni Hiltunen <jouni.hiltunen at kolumbus.fi> Translations [fi]
+Tommi Vainikainen <Tommi.Vainikainen at iki.fi> Translations [fi]
+
+Laurentiu Buzdugan <buzdugan at voyager.net> Translations [ro]
+
 Magda Procha'zkova'  <magda at math.muni.cz> Translations [cs]
 
 Michael Roth  <mroth at nessie.de>  Assigns changes.
     (wrote cipher/des.c., changes and bug fixes all over the place)
 
+Michal Majer <mmajer at econ.umb.sk> Translations [sk]
+
 Marco d'Itri <md at linux.it> Translations [it]
 
 Matthew Skala <mskala at ansuz.sooke.bc.ca>  Disclaimer
@@ -65,7 +77,7 @@
 
 Pedro Morais <morais at poli.org> Translations [pt_PT]
 
-Rémi Guyomarch	<rguyom at mail.dotcom.fr> Assigns past and future changes.
+Rémi Guyomarch	<rguyom at mail.dotcom.fr> Assigns past and future changes.
     (g10/compress.c, g10/encr-data.c,
      g10/free-packet.c, g10/mdfilter.c, g10/plaintext.c, util/iobuf.c)
 
@@ -93,8 +105,8 @@
 
 
 
-Other legal information
-=======================
+Other authors
+=============
 
 This program uses the zlib compression library written by
 Jean-loup Gailly and Mark Adler.
@@ -113,6 +125,10 @@
 The RPM specs file scripts/gnupg.spec has been contributed by
 several people.
 
+The files below scripts/conf-w32brg/ is a contribution to GnuPG by
+Brian Gladman and not to be considered a proper part of GnuPG.
+
+
  Copyright 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
Index: gnupg/ChangeLog
diff -u gnupg/ChangeLog:1.221 gnupg/ChangeLog:1.222
--- gnupg/ChangeLog:1.221	Wed Nov 17 17:04:21 2004
+++ gnupg/ChangeLog	Tue Dec 14 08:49:26 2004
@@ -1,3 +1,9 @@
+2004-12-14  Werner Koch  <wk at g10code.com>
+
+	Released 1.3.93.
+	
+	* Makefile.am (AUTOMAKE_OPTIONS): Add filename-length-max=99.
+
 2004-11-06  David Shaw  <dshaw at jabberwocky.com>
 
 	* configure.ac: Autodetect wldap32 on Windoze.
@@ -1093,8 +1099,8 @@
 
 Wed Jun  7 19:19:09 CEST 2000  Werner Koch  <wk at openit.de>
 
-  * acinclude.m4 (MKDIR_TAKES_ONE_ARG): Check some headers. By Gaël Quéri.
-  * configure.in (AM_INIT_AUTOMAKE): Use this now. By Gaël.
+  * acinclude.m4 (MKDIR_TAKES_ONE_ARG): Check some headers. By Gaël Quéri.
+  * configure.in (AM_INIT_AUTOMAKE): Use this now. By Gaël.
 
 Mon Jun  5 12:37:43 CEST 2000  Werner Koch  <wk at openit.de>
 
@@ -1166,7 +1172,7 @@
 Thu Feb 10 17:39:44 CET 2000  Werner Koch  <wk at gnupg.de>
 
 	* configure.in: Use /usr/local for CFLAGS and LDFLAGS when
-	target is freebsd.  By Rémi.
+	target is freebsd.  By Rémi.
 
 Thu Jan 13 19:31:58 CET 2000  Werner Koch  <wk at gnupg.de>
 
@@ -1433,7 +1439,7 @@
 
 	* config.links (m68k-atari-mint): New
 
-Tue Jan 12 09:17:19 CET 1999  Gaël Quéri <gqueri at mail.dotcom.fr>
+Tue Jan 12 09:17:19 CET 1999  Gaël Quéri <gqueri at mail.dotcom.fr>
 
 	* all: Fixed typos all over the place
 
Index: gnupg/INSTALL
diff -u gnupg/INSTALL:1.27 gnupg/INSTALL:1.28
--- gnupg/INSTALL:1.27	Tue Dec  9 10:12:43 2003
+++ gnupg/INSTALL	Tue Dec 14 08:49:26 2004
@@ -1,13 +1,16 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
+Installation Instructions
+*************************
 
-   This file is free documentation; the Free Software Foundation gives
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-   These are generic installation instructions.
+These are generic installation instructions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -67,9 +70,9 @@
 Compilers and Options
 =====================
 
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
@@ -82,7 +85,7 @@
 Compiling For Multiple Architectures
 ====================================
 
-   You can compile the package for more than one kind of computer at the
+You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you must use a version of `make' that
 supports the `VPATH' variable, such as GNU `make'.  `cd' to the
@@ -99,19 +102,19 @@
 Installation Names
 ==================
 
-   By default, `make install' will install the package's files in
+By default, `make install' will install the package's files in
 `/usr/local/bin', `/usr/local/man', etc.  You can specify an
 installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+option `--prefix=PREFIX'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
+give `configure' the option `--exec-prefix=PREFIX', the package will
+use PREFIX as the prefix for installing programs and libraries.
 Documentation and other data files will still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
 
@@ -122,7 +125,7 @@
 Optional Features
 =================
 
-   Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -137,11 +140,11 @@
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -167,9 +170,9 @@
 Sharing Defaults
 ================
 
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -178,7 +181,7 @@
 Defining Variables
 ==================
 
-   Variables not defined in a site shell script can be set in the
+Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -192,8 +195,7 @@
 `configure' Invocation
 ======================
 
-   `configure' recognizes the following options to control how it
-operates.
+`configure' recognizes the following options to control how it operates.
 
 `--help'
 `-h'
Index: gnupg/Makefile.am
diff -u gnupg/Makefile.am:1.51 gnupg/Makefile.am:1.52
--- gnupg/Makefile.am:1.51	Fri Oct 15 11:55:39 2004
+++ gnupg/Makefile.am	Tue Dec 14 08:49:26 2004
@@ -20,7 +20,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 DISTCHECK_CONFIGURE_FLAGS = --enable-selinux-support
-AUTOMAKE_OPTIONS = dist-bzip2
+AUTOMAKE_OPTIONS = dist-bzip2 filename-length-max=99
 
 if CROSS_COMPILING
 checks =
Index: gnupg/NEWS
diff -u gnupg/NEWS:1.222 gnupg/NEWS:1.223
--- gnupg/NEWS:1.222	Thu Oct 28 11:50:24 2004
+++ gnupg/NEWS	Tue Dec 14 08:49:26 2004
@@ -1,6 +1,10 @@
-Noteworthy changes in version 1.3.93
+Noteworthy changes in version 1.3.93 (2004-12-14)
 -------------------------------------------------
 
+    * Ask the user to repeat a changed PIN.
+
+    * Switched to automake 1.9.  Minor big fixes.
+
     
 Noteworthy changes in version 1.3.92 (2004-10-28)
 -------------------------------------------------
@@ -1675,7 +1679,8 @@
       is generated on a system without a good random number generator.
 
 
-Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright 1998, 1999, 2000, 2001, 2002, 2003,
+          2004  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
Index: gnupg/README
diff -u gnupg/README:1.90 gnupg/README:1.91
--- gnupg/README:1.90	Wed Nov 17 17:04:21 2004
+++ gnupg/README	Tue Dec 14 08:49:26 2004
@@ -1,7 +1,7 @@
 
 		    GnuPG - The GNU Privacy Guard
 		   -------------------------------
-			    Version 1.3.92
+			    Version 1.4.0
 
 	    Copyright 1998, 1999, 2000, 2001, 2002, 2003,
 		 2004 Free Software Foundation, Inc.
@@ -761,4 +761,4 @@
     and we try to answer questions when time allows us to do so.
 
     Commercial grade support for GnuPG is available; please see
-    the GNU service directory or search other resources.
+    the GNU service directory or check out http://g10code.com.
Index: gnupg/configure.ac
diff -u gnupg/configure.ac:1.112 gnupg/configure.ac:1.113
--- gnupg/configure.ac:1.112	Sat Nov  6 14:18:13 2004
+++ gnupg/configure.ac	Tue Dec 14 08:49:26 2004
@@ -19,14 +19,14 @@
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 dnl
 dnl (Process this file with autoconf to produce a configure script.)
-dnlAC_REVISION($Revision: 1.112 $)dnl
+dnlAC_REVISION($Revision: 1.113 $)dnl
 
 AC_PREREQ(2.59)
 min_automake_version="1.7.9"
 
 # Remember to change the version number immediately *after* a release
 # and remove the "-cvs" or "rc" suffix immediately *before* a release.
-AC_INIT(gnupg, 1.3.93-cvs, bug-gnupg at gnu.org)
+AC_INIT(gnupg, 1.3.93, bug-gnupg at gnu.org)
 # Set development_version to yes if the minor number is odd or you
 # feel that the default check for a development version is not
 # sufficient.
Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.654 gnupg/g10/ChangeLog:1.655
--- gnupg/g10/ChangeLog:1.654	Mon Dec 13 09:04:52 2004
+++ gnupg/g10/ChangeLog	Tue Dec 14 08:49:26 2004
@@ -1,3 +1,11 @@
+2004-12-14  Werner Koch  <wk at g10code.com>
+
+	* keyserver.c (keyserver_work, keyserver_spawn): Map ldaps to ldap.
+
+	* keyedit.c (keyedit_menu): Removed the N_() markers from the
+	command names.
+	* card-util.c (card_edit): Ditto.
+
 2004-12-13  Werner Koch  <wk at g10code.com>
 
 	* passphrase.c (read_passphrase_from_fd): Fixed memory leak.
@@ -2999,7 +3007,7 @@
 2003-04-10  Werner Koch  <wk at gnupg.org>
 
 	* passphrase.c (read_passphrase_from_fd): Do a dummy read if the
-	agent is to be used.  Noted by Ingo Klöcker.
+	agent is to be used.  Noted by Ingo Klöcker.
 	(agent_get_passphrase): Inhibit caching when we have no
 	fingerprint.  This is required for key generation as well as for
 	symmetric only encryption.
@@ -3942,7 +3950,7 @@
 	warning.
 
 	* passphrase.c (agent_get_passphrase): Fixed signed/unsigned char
-	problem in %-escaping.  Noted by Ingo Klöcker.
+	problem in %-escaping.  Noted by Ingo Klöcker.
 
 2002-10-03  David Shaw  <dshaw at jabberwocky.com>
 
@@ -8270,12 +8278,12 @@
 Thu Feb 10 17:39:44 CET 2000  Werner Koch  <wk at gnupg.de>
 
 	* keyedit.c (menu_expire): Fixed segv due to unitialized sub_pk.
-	By Rémi.
+	By Rémi.
 
 Thu Feb 10 11:39:41 CET 2000  Werner Koch  <wk at gnupg.de>
 
 	* keylist.c (list_keyblock): Don't print warnings in the middle of
-	regulat output lines.  By Rémi.
+	regulat output lines.  By Rémi.
 
 	* sig-check.c: Include options.h
 
@@ -8865,7 +8873,7 @@
 	* g10.c (main): Fix for SHM init (Michael).
 
 	* compress.c, encr-data.c, mdfilter.c,
-	  plaintext.c, free-packet.c: Speed patches (Rémi).
+	  plaintext.c, free-packet.c: Speed patches (Rémi).
 
 Thu May 27 09:40:55 CEST 1999  Werner Koch  <wk at isil.d.shuttle.de>
 
@@ -8890,7 +8898,7 @@
 Tue May 25 19:50:32 CEST 1999  Werner Koch  <wk at isil.d.shuttle.de>
 
 	* sign.c (sign_file): Always use compression algo 1 for signed
-	onyl file becuase we can´ be sure the the verifier supports other
+	onyl file becuase we can´ be sure the the verifier supports other
 	algorithms.
 
 	* build-packet.c (build_sig_subpkt): Support for notation data.
@@ -9080,7 +9088,7 @@
 	(protect_secret_key). Ditto.
 	* misc.c (print_cipher_algo_note): Twofish is now a standard algo.
 
-	* keygen.c (do_create): Fixed spelling (Gaël Quéri)
+	* keygen.c (do_create): Fixed spelling (Gaël Quéri)
 	(ask_keysize): Only allow keysizes up to 4096
 
 	* ringedit.c (add_keyblock_resource): chmod newly created secrings.
@@ -9123,7 +9131,7 @@
 
 	* trustdb.c (insert_trust_record): Always use the primary key.
 
-	* encode.c (encode_simple): Added text_mode filter (Rémi Guyomarch)
+	* encode.c (encode_simple): Added text_mode filter (Rémi Guyomarch)
 	(encode_crypt): Ditto.
 
 	* mainproc.c (proc_pubkey_enc): Added status ENC_TO.
@@ -10504,7 +10512,7 @@
 
 Wed Apr  8 09:47:21 1998  Werner Koch  (wk at isil.d.shuttle.de)
 
-	* sig-check.c (do_check): Applied small fix from Ulf Möller.
+	* sig-check.c (do_check): Applied small fix from Ulf Möller.
 
 Tue Apr  7 19:28:07 1998  Werner Koch  (wk at isil.d.shuttle.de)
 
Index: gnupg/g10/card-util.c
diff -u gnupg/g10/card-util.c:1.23 gnupg/g10/card-util.c:1.24
--- gnupg/g10/card-util.c:1.23	Fri Dec 10 11:49:14 2004
+++ gnupg/g10/card-util.c	Tue Dec 14 08:49:26 2004
@@ -1247,29 +1247,26 @@
     int admin_only;
     const char *desc;
   } cmds[] = {
-    { N_("quit")  , cmdQUIT  , 0, N_("quit this menu") },
-    { N_("q")     , cmdQUIT  , 0, NULL   },
-    { N_("admin") , cmdADMIN , 0, N_("show admin commands") },
-    { N_("help")  , cmdHELP  , 0, N_("show this help") },
-    {    "?"      , cmdHELP  , 0, NULL   },
-    { N_("list")  , cmdLIST  , 0, N_("list all available data") },
-    { N_("l")     , cmdLIST  , 0, NULL   },
-    { N_("debug") , cmdDEBUG , 0, NULL },
-    { N_("name")  , cmdNAME  , 1, N_("change card holder's name") },
-    { N_("url")   , cmdURL   , 1, N_("change URL to retrieve key") },
-    { N_("fetch") , cmdFETCH , 0,
-                               N_("fetch the key specified in the card URL") },
-    { N_("login") , cmdLOGIN , 1, N_("change the login name") },
-    { N_("lang")  , cmdLANG  , 1, N_("change the language preferences") },
-    { N_("sex")   , cmdSEX   , 1, N_("change card holder's sex") },
-    { N_("cafpr"),  cmdCAFPR,  1, N_("change a CA fingerprint") },
-    { N_("forcesig"),
-                  cmdFORCESIG, 1, N_("toggle the signature force PIN flag") },
-    { N_("generate"),
-                  cmdGENERATE, 1, N_("generate new keys") },
-    { N_("passwd"), cmdPASSWD, 0, N_("menu to change or unblock the PIN") },
+    { "quit"    , cmdQUIT  , 0, N_("quit this menu")},
+    { "q"       , cmdQUIT  , 0, NULL },
+    { "admin"   , cmdADMIN , 0, N_("show admin commands")},
+    { "help"    , cmdHELP  , 0, N_("show this help")},
+    { "?"       , cmdHELP  , 0, NULL },
+    { "list"    , cmdLIST  , 0, N_("list all available data")},
+    { "l"       , cmdLIST  , 0, NULL },
+    { "debug"   , cmdDEBUG , 0, NULL },
+    { "name"    , cmdNAME  , 1, N_("change card holder's name")},
+    { "url"     , cmdURL   , 1, N_("change URL to retrieve key")},
+    { "fetch"   , cmdFETCH , 0, N_("fetch the key specified in the card URL")},
+    { "login"   , cmdLOGIN , 1, N_("change the login name")},
+    { "lang"    , cmdLANG  , 1, N_("change the language preferences")},
+    { "sex"     , cmdSEX   , 1, N_("change card holder's sex")},
+    { "cafpr"   , cmdCAFPR , 1, N_("change a CA fingerprint")},
+    { "forcesig", cmdFORCESIG, 1, N_("toggle the signature force PIN flag")},
+    { "generate", cmdGENERATE, 1, N_("generate new keys")},
+    { "passwd"  , cmdPASSWD, 0, N_("menu to change or unblock the PIN")},
     /* Note, that we do not announce this command yet. */
-    { N_("privatedo"), cmdPRIVATEDO, 0, NULL },
+    { "privatedo", cmdPRIVATEDO, 0, NULL },
     { NULL, cmdINVCMD, 0, NULL } 
   };
  
Index: gnupg/g10/keyedit.c
diff -u gnupg/g10/keyedit.c:1.157 gnupg/g10/keyedit.c:1.158
--- gnupg/g10/keyedit.c:1.157	Wed Nov 24 06:25:03 2004
+++ gnupg/g10/keyedit.c	Tue Dec 14 08:49:26 2004
@@ -1242,56 +1242,57 @@
                     int not_with_sk;  /* but 2 == must use SK */
 		    const char *desc;
 		  } cmds[] = { 
-	{ N_("quit")    , cmdQUIT      , 0,0, N_("quit this menu") },
-	{ N_("q")       , cmdQUIT      , 0,0, NULL   },
-	{ N_("save")    , cmdSAVE      , 0,0, N_("save and quit") },
-	{ N_("help")    , cmdHELP      , 0,0, N_("show this help") },
-	{    "?"        , cmdHELP      , 0,0, NULL   },
-	{ N_("fpr")     , cmdFPR       , 0,0, N_("show fingerprint") },
-	{ N_("list")    , cmdLIST      , 0,0, N_("list key and user IDs") },
-	{ N_("l")       , cmdLIST      , 0,0, NULL   },
-	{ N_("uid")     , cmdSELUID    , 0,0, N_("select user ID N") },
-	{ N_("key")     , cmdSELKEY    , 0,0, N_("select secondary key N") },
-	{ N_("check")   , cmdCHECK     , 0,0, N_("list signatures") },
-	{ N_("c")       , cmdCHECK     , 0,0, NULL },
-	{ N_("sign")    , cmdSIGN      , 0,1, N_("sign the key") },
-	{ N_("s")       , cmdSIGN      , 0,1, NULL },
-	{ N_("tsign")   , cmdTSIGN     , 0,1, N_("make a trust signature")},
-	{ N_("lsign")   , cmdLSIGN     , 0,1, N_("sign the key locally") },
-	{ N_("nrsign")  , cmdNRSIGN    , 0,1, N_("sign the key non-revocably") },
-	{ N_("nrlsign") , cmdNRLSIGN   , 0,1, N_("sign the key locally and non-revocably") },
-	{ N_("debug")   , cmdDEBUG     , 0,0, NULL },
-	{ N_("adduid")  , cmdADDUID    , 1,1, N_("add a user ID") },
-	{ N_("addphoto"), cmdADDPHOTO  , 1,1, N_("add a photo ID") },
-	{ N_("deluid")  , cmdDELUID    , 0,1, N_("delete user ID") },
+	{ "quit"     , cmdQUIT      , 0,0, N_("quit this menu") },
+	{ "q"        , cmdQUIT      , 0,0, NULL   },
+	{ "save"     , cmdSAVE      , 0,0, N_("save and quit") },
+	{ "help"     , cmdHELP      , 0,0, N_("show this help") },
+	{ "?"        , cmdHELP      , 0,0, NULL   },
+	{ "fpr"      , cmdFPR       , 0,0, N_("show fingerprint") },
+	{ "list"     , cmdLIST      , 0,0, N_("list key and user IDs") },
+	{ "l"        , cmdLIST      , 0,0, NULL   },
+	{ "uid"      , cmdSELUID    , 0,0, N_("select user ID N") },
+	{ "key"      , cmdSELKEY    , 0,0, N_("select secondary key N") },
+	{ "check"    , cmdCHECK     , 0,0, N_("list signatures") },
+	{ "c"        , cmdCHECK     , 0,0, NULL },
+	{ "sign"     , cmdSIGN      , 0,1, N_("sign the key") },
+	{ "s"        , cmdSIGN      , 0,1, NULL },
+	{ "tsign"    , cmdTSIGN     , 0,1, N_("make a trust signature")},
+	{ "lsign"    , cmdLSIGN     , 0,1, N_("sign the key locally") },
+	{ "nrsign"   , cmdNRSIGN    , 0,1, N_("sign the key non-revocably") },
+	{ "nrlsign"  , cmdNRLSIGN   , 0,1, N_("sign the key locally "
+                                              "and non-revocably") },
+	{ "debug"    , cmdDEBUG     , 0,0, NULL },
+	{ "adduid"   , cmdADDUID    , 1,1, N_("add a user ID") },
+	{ "addphoto" , cmdADDPHOTO  , 1,1, N_("add a photo ID") },
+	{ "deluid"   , cmdDELUID    , 0,1, N_("delete user ID") },
 	/* delphoto is really deluid in disguise */
-	{ N_("delphoto"), cmdDELUID    , 0,1, NULL },
-	{ N_("addkey")  , cmdADDKEY    , 1,1, N_("add a secondary key") },
+	{ "delphoto" , cmdDELUID    , 0,1, NULL },
+	{ "addkey"   , cmdADDKEY    , 1,1, N_("add a secondary key") },
 #ifdef ENABLE_CARD_SUPPORT
-	{ N_("addcardkey"), cmdADDCARDKEY , 1,1, N_("add a key to a smartcard") },
-	{ N_("keytocard"), cmdKEYTOCARD , 1,2, N_("move a key to a smartcard")},
+	{ "addcardkey", cmdADDCARDKEY , 1,1, N_("add a key to a smartcard") },
+	{ "keytocard", cmdKEYTOCARD , 1,2, N_("move a key to a smartcard")},
 #endif /*ENABLE_CARD_SUPPORT*/
-	{ N_("delkey")  , cmdDELKEY    , 0,1, N_("delete a secondary key") },
-	{ N_("addrevoker"),cmdADDREVOKER,1,1, N_("add a revocation key") },
-	{ N_("delsig")  , cmdDELSIG    , 0,1, N_("delete signatures") },
-	{ N_("expire")  , cmdEXPIRE    , 1,1, N_("change the expire date") },
-        { N_("primary") , cmdPRIMARY   , 1,1, N_("flag user ID as primary")},
-	{ N_("toggle")  , cmdTOGGLE    , 1,0, N_("toggle between secret "
-					         "and public key listing") },
-	{ N_("t"     )  , cmdTOGGLE    , 1,0, NULL },
-	{ N_("pref")    , cmdPREF      , 0,1, N_("list preferences (expert)")},
-	{ N_("showpref"), cmdSHOWPREF  , 0,1, N_("list preferences (verbose)") },
-	{ N_("setpref") , cmdSETPREF   , 1,1, N_("set preference list") },
-	{ N_("updpref") , cmdUPDPREF   , 1,1, N_("updated preferences") },
-	{ N_("keyserver"),cmdPREFKS    , 1,1, N_("set preferred keyserver URL")},
-	{ N_("passwd")  , cmdPASSWD    , 1,1, N_("change the passphrase") },
-	{ N_("trust")   , cmdTRUST     , 0,1, N_("change the ownertrust") },
-	{ N_("revsig")  , cmdREVSIG    , 0,1, N_("revoke signatures") },
-	{ N_("revuid")  , cmdREVUID    , 1,1, N_("revoke a user ID") },
-	{ N_("revkey")  , cmdREVKEY    , 1,1, N_("revoke a secondary key") },
-	{ N_("disable") , cmdDISABLEKEY, 0,1, N_("disable a key") },
-	{ N_("enable")  , cmdENABLEKEY , 0,1, N_("enable a key") },
-	{ N_("showphoto"),cmdSHOWPHOTO , 0,0, N_("show photo ID") },
+	{ "delkey"   , cmdDELKEY    , 0,1, N_("delete a secondary key") },
+	{ "addrevoker",cmdADDREVOKER,1,1, N_("add a revocation key") },
+	{ "delsig"   , cmdDELSIG    , 0,1, N_("delete signatures") },
+	{ "expire"   , cmdEXPIRE    , 1,1, N_("change the expire date") },
+        { "primary"  , cmdPRIMARY   , 1,1, N_("flag user ID as primary")},
+	{ "toggle"   , cmdTOGGLE    , 1,0, N_("toggle between secret "
+	     		                      "and public key listing") },
+	{ "t"        , cmdTOGGLE    , 1,0, NULL },
+	{ "pref"     , cmdPREF      , 0,1, N_("list preferences (expert)")},
+	{ "showpref" , cmdSHOWPREF  , 0,1, N_("list preferences (verbose)") },
+	{ "setpref"  , cmdSETPREF   , 1,1, N_("set preference list") },
+	{ "updpref"  , cmdUPDPREF   , 1,1, N_("updated preferences") },
+	{ "keyserver",cmdPREFKS     , 1,1, N_("set preferred keyserver URL")},
+	{ "passwd"   , cmdPASSWD    , 1,1, N_("change the passphrase") },
+	{ "trust"    , cmdTRUST     , 0,1, N_("change the ownertrust") },
+	{ "revsig"   , cmdREVSIG    , 0,1, N_("revoke signatures") },
+	{ "revuid"   , cmdREVUID    , 1,1, N_("revoke a user ID") },
+	{ "revkey"   , cmdREVKEY    , 1,1, N_("revoke a secondary key") },
+	{ "disable"  , cmdDISABLEKEY, 0,1, N_("disable a key") },
+	{ "enable"   , cmdENABLEKEY , 0,1, N_("enable a key") },
+	{ "showphoto",cmdSHOWPHOTO  , 0,0, N_("show photo ID") },
 	{ NULL, cmdNONE, 0, 0, NULL } };
     enum cmdids cmd = 0;
     int rc = 0;
Index: gnupg/g10/keyserver.c
diff -u gnupg/g10/keyserver.c:1.72 gnupg/g10/keyserver.c:1.73
--- gnupg/g10/keyserver.c:1.72	Sun Dec 12 06:10:22 2004
+++ gnupg/g10/keyserver.c	Tue Dec 14 08:49:26 2004
@@ -789,10 +789,15 @@
 #endif
 
   /* Build the filename for the helper to execute */
+  /* Note that we don't use a symlink for "ldaps" anymore because this
+     won't work under MS Windows. */
   command=m_alloc(strlen("gpgkeys_")+strlen(keyserver->scheme)+1);
-  strcpy(command,"gpgkeys_");
-  strcat(command,keyserver->scheme);
-
+  strcpy(command,"gpgkeys_"); 
+  if (!strcmp (keyserver->scheme, "ldaps"))
+    strcat(command, "ldap");
+  else
+    strcat(command,keyserver->scheme);
+  
   if(opt.keyserver_options.options&KEYSERVER_USE_TEMP_FILES)
     {
       if(opt.keyserver_options.options&KEYSERVER_KEEP_TEMP_FILES)
@@ -1247,7 +1252,9 @@
 
 	case KEYSERVER_VERSION_ERROR:
 	  log_error(_("gpgkeys_%s does not support handler version %d\n"),
-		    keyserver->scheme,KEYSERVER_PROTO_VERSION);
+		    !strcmp (keyserver->scheme,"ldaps")?
+                    "ldap": keyserver->scheme, 
+                    KEYSERVER_PROTO_VERSION);
 	  break;
 
 	case KEYSERVER_TIMEOUT:
Index: gnupg/keyserver/ChangeLog
diff -u gnupg/keyserver/ChangeLog:1.92 gnupg/keyserver/ChangeLog:1.93
--- gnupg/keyserver/ChangeLog:1.92	Fri Dec  3 20:12:38 2004
+++ gnupg/keyserver/ChangeLog	Tue Dec 14 08:49:26 2004
@@ -1,3 +1,8 @@
+2004-12-14  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (install-exec-hook, uninstall-hook): Removed.  For
+	Windows reasons we can't use the symlink trick.
+
 2004-12-03  David Shaw  <dshaw at jabberwocky.com>
 
 	* Makefile.am: The harmless "ignored error" on gpgkeys_ldap
Index: gnupg/keyserver/Makefile.am
diff -u gnupg/keyserver/Makefile.am:1.20 gnupg/keyserver/Makefile.am:1.21
--- gnupg/keyserver/Makefile.am:1.20	Fri Dec  3 20:12:38 2004
+++ gnupg/keyserver/Makefile.am	Tue Dec 14 08:49:26 2004
@@ -39,12 +39,4 @@
 gpgkeys_http_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@  $(other_libs) @GETOPT@ @W32LIBS@
 gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
 
-install-exec-hook:
-if GPGKEYS_LDAP
-	(cd $(libexecdir) && $(LN_S) -f gpgkeys_ldap$(EXEEXT) gpgkeys_ldaps$(EXEEXT))
-endif
 
-uninstall-hook:
-if GPGKEYS_LDAP
-	rm -f $(libexecdir)/gpgkeys_ldaps$(EXEEXT)
-endif
Index: gnupg/po/be.po
diff -u gnupg/po/be.po:1.8 gnupg/po/be.po:1.9
--- gnupg/po/be.po:1.8	Fri Dec 10 23:21:02 2004
+++ gnupg/po/be.po	Tue Dec 14 08:49:26 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <nab at mail.by>\n"
 "Language-Team: Belarusian <i18n at mova.org>\n"
@@ -31,7 +31,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -338,7 +338,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 msgid "can't do this in batch mode\n"
 msgstr ""
@@ -541,160 +541,87 @@
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "quit [выйсьці]"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr ""
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "даведка (help)"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr ""
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Даведка адсутнічае"
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr ""
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr ""
-
-#: g10/card-util.c:1258
-msgid "name"
-msgstr ""
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-msgid "login"
-msgstr ""
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-msgid "cafpr"
-msgstr ""
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1266
-msgid "forcesig"
-msgstr ""
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "агульная памылка"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr ""
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Загад> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
@@ -738,7 +665,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -748,13 +675,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1201,7 +1128,7 @@
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr ""
 
@@ -1209,7 +1136,7 @@
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr ""
 
@@ -1313,7 +1240,7 @@
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
@@ -1323,352 +1250,352 @@
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2616
+#: g10/g10.c:2614
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2622
+#: g10/g10.c:2620
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2635
+#: g10/g10.c:2633
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:2744
+#: g10/g10.c:2742
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/g10.c:2746
+#: g10/g10.c:2744
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2862
+#: g10/g10.c:2860
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2867
+#: g10/g10.c:2865
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr ""
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr ""
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -2426,12 +2353,12 @@
 msgstr ""
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr ""
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -2594,7 +2521,7 @@
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2644,18 +2571,10 @@
 msgstr ""
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr ""
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr ""
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr ""
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr ""
 
@@ -2664,708 +2583,564 @@
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr ""
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr ""
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr ""
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr ""
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr ""
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr ""
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr ""
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr ""
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr ""
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr ""
-
-#: g10/keyedit.c:1259
-msgid "tsign"
-msgstr ""
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "зрабіць адчэплены подпіс"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr ""
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr ""
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr ""
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr ""
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr ""
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr ""
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr ""
-
-#: g10/keyedit.c:1264
-msgid "add a user ID"
-msgstr ""
-
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr ""
-
 #: g10/keyedit.c:1265
-msgid "add a photo ID"
+msgid "add a user ID"
 msgstr ""
 
 #: g10/keyedit.c:1266
-msgid "deluid"
+msgid "add a photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr ""
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr ""
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr ""
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr ""
 
-#: g10/keyedit.c:1271
-msgid "addcardkey"
-msgstr ""
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr ""
-
-#: g10/keyedit.c:1274
-msgid "delete a secondary key"
-msgstr ""
-
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr ""
-
 #: g10/keyedit.c:1275
-msgid "add a revocation key"
-msgstr ""
-
-#: g10/keyedit.c:1276
-msgid "delsig"
+msgid "delete a secondary key"
 msgstr ""
 
 #: g10/keyedit.c:1276
-msgid "delete signatures"
-msgstr ""
-
-#: g10/keyedit.c:1277
-msgid "expire"
+msgid "add a revocation key"
 msgstr ""
 
 #: g10/keyedit.c:1277
-msgid "change the expire date"
-msgstr ""
-
-#: g10/keyedit.c:1278
-msgid "primary"
+msgid "delete signatures"
 msgstr ""
 
 #: g10/keyedit.c:1278
-msgid "flag user ID as primary"
+msgid "change the expire date"
 msgstr ""
 
 #: g10/keyedit.c:1279
-msgid "toggle"
+msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr ""
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr ""
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr ""
-
-#: g10/keyedit.c:1282
-msgid "list preferences (expert)"
-msgstr ""
-
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr ""
-
 #: g10/keyedit.c:1283
-msgid "list preferences (verbose)"
-msgstr ""
-
-#: g10/keyedit.c:1284
-msgid "setpref"
+msgid "list preferences (expert)"
 msgstr ""
 
 #: g10/keyedit.c:1284
-msgid "set preference list"
-msgstr ""
-
-#: g10/keyedit.c:1285
-msgid "updpref"
+msgid "list preferences (verbose)"
 msgstr ""
 
 #: g10/keyedit.c:1285
-msgid "updated preferences"
-msgstr ""
-
-#: g10/keyedit.c:1286
-msgid "keyserver"
+msgid "set preference list"
 msgstr ""
 
 #: g10/keyedit.c:1286
-msgid "set preferred keyserver URL"
+msgid "updated preferences"
 msgstr ""
 
 #: g10/keyedit.c:1287
-msgid "change the passphrase"
-msgstr ""
-
-#: g10/keyedit.c:1288
-msgid "trust"
+msgid "set preferred keyserver URL"
 msgstr ""
 
 #: g10/keyedit.c:1288
-msgid "change the ownertrust"
-msgstr ""
-
-#: g10/keyedit.c:1289
-msgid "revsig"
+msgid "change the passphrase"
 msgstr ""
 
 #: g10/keyedit.c:1289
-msgid "revoke signatures"
+msgid "change the ownertrust"
 msgstr ""
 
 #: g10/keyedit.c:1290
-msgid "revuid"
+msgid "revoke signatures"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 #, fuzzy
 msgid "revoke a user ID"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr ""
-
-#: g10/keyedit.c:1291
-msgid "revoke a secondary key"
-msgstr ""
-
 #: g10/keyedit.c:1292
-msgid "disable"
-msgstr ""
-
-#: g10/keyedit.c:1292
-msgid "disable a key"
-msgstr ""
-
-#: g10/keyedit.c:1293
-msgid "enable"
+msgid "revoke a secondary key"
 msgstr ""
 
 #: g10/keyedit.c:1293
-msgid "enable a key"
+msgid "disable a key"
 msgstr ""
 
 #: g10/keyedit.c:1294
-msgid "showphoto"
+msgid "enable a key"
 msgstr ""
 
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Даступны сакрэтны ключ.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr ""
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 msgid "Really sign all user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 msgid "Really remove this user ID? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 msgid "You must select exactly one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 msgid "Do you really want to delete this key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 msgid "Set preference list to:\n"
 msgstr ""
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1776
 msgid "Really update the preferences? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Захаваць зьмены? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Выйсьці не захаваўшы зьмены? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2252
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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:2596
+#: g10/keyedit.c:2597
 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:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2607
+#: g10/keyedit.c:2608
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 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:2885
+#: g10/keyedit.c:2886
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2943
+#: g10/keyedit.c:2944
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2965
+#: g10/keyedit.c:2966
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2984
+#: g10/keyedit.c:2985
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:2990
+#: g10/keyedit.c:2991
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3497
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3738
+#: g10/keyedit.c:3739
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3765
+#: g10/keyedit.c:3766
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:3791
+#: g10/keyedit.c:3792
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3665,7 +3440,7 @@
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr ""
@@ -3911,7 +3686,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
@@ -3926,104 +3701,104 @@
 msgid "key not found on keyserver\n"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "агульная памылка"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1600
+#: g10/keyserver.c:1607
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr ""
@@ -4202,7 +3977,7 @@
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 #, fuzzy
 msgid "unknown"
 msgstr "невядомая вэрсыя"
@@ -4373,50 +4148,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
 
-#: g10/passphrase.c:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, c-format
 msgid " (main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4427,40 +4202,40 @@
 "\"%.*s\"\n"
 "%u-бітавы %s ключ, ID %08lX, створаны %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Увядзіце пароль\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "пароль занадта доўгі\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 msgid "can't query passphrase in batch mode\n"
 msgstr ""
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Увядзіце пароль: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4470,17 +4245,17 @@
 "Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\n"
 "карыстальніка: \""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/passphrase.c:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Паўтарыце пароль: "
 
@@ -5298,12 +5073,12 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
@@ -5362,7 +5137,7 @@
 msgid "[ revoked]"
 msgstr "памылка чытаньня файла"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "збой падпісаньня: %s\n"
@@ -5372,100 +5147,100 @@
 msgid "[ unknown]"
 msgstr "невядомая вэрсыя"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:604
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -5734,6 +5509,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "quit [выйсьці]"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
@@ -5771,6 +5550,13 @@
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
+#~ msgid "help"
+#~ msgstr "даведка (help)"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "агульная памылка"
+
 #, fuzzy
 #~ msgid "writing to file `%s'\n"
 #~ msgstr "запіс у stdout\n"
Index: gnupg/po/ca.po
diff -u gnupg/po/ca.po:1.10 gnupg/po/ca.po:1.11
--- gnupg/po/ca.po:1.10	Fri Dec 10 23:21:01 2004
+++ gnupg/po/ca.po	Tue Dec 14 08:49:26 2004
@@ -27,7 +27,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4rc\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2003-12-05 19:15+0100\n"
 "Last-Translator: Jordi Mallach <jordi at gnu.org>\n"
 "Language-Team: Catalan <ca at dodds.net>\n"
@@ -51,7 +51,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -383,7 +383,7 @@
 
 # Dest�s? ivb
 # Desat�s, s�. jm
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -599,167 +599,90 @@
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja �s present\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "ix"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "ix del men�"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "q"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "ajuda"
-
 # �pantalla� o �ajuda�?  ivb
 # �ajuda�, evidentment. jm
 #: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "llista"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "La clau �s disponible en: "
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "depura"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "enable"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsign"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "canvia la data de caducitat"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "canvia la confian�a"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "error general"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nou parell de claus"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Ordre> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "s'est� escrivint la clau secreta a �%s�\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no �s v�lida (proveu �help�)\n"
 
@@ -807,7 +730,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -817,13 +740,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: 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:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1306,7 +1229,7 @@
 msgid "Pubkey: "
 msgstr "Clau p�blica: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "Xifratge: "
 
@@ -1314,7 +1237,7 @@
 msgid "Hash: "
 msgstr "Dispersi�: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Compressi�: "
 
@@ -1427,7 +1350,7 @@
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de �%s�\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no �s per a �s normal!\n"
@@ -1439,343 +1362,343 @@
 "la extensi� de xifrat �%s� no s'ha carregat per tindre permissos "
 "insegurs\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, 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/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr ""
 "no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanci� no v�lides\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "opcions d'importaci� no v�lides\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanci� no v�lides\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importaci� no v�lides\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 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/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AV�S: %s t� prefer�ncia sobre %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no �s perm�s amb %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no t� sentit amb %s!\n"
 
 # clares -> en clar?  ivb
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 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/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 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/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no �s v�lid\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no �s v�lid\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no �s v�lid\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificaci� seleccionat no �s v�lid\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, 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/g10.c:2744
+#: g10/g10.c:2742
 #, 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/g10.c:2746
+#: g10/g10.c:2744
 #, 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/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no �s gens recomanable\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 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/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "les prefer�ncies per defecte s�n inv�lides\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "les prefer�ncies personals de xifrat s�n inv�lides\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "les prefer�ncies personals de digest s�n inv�lides\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "les prefer�ncies personals de compressi� s�n inv�lides\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, 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/g10.c:2862
+#: g10/g10.c:2860
 #, 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/g10.c:2867
+#: g10/g10.c:2865
 #, 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/g10.c:2963
+#: g10/g10.c:2961
 #, 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/g10.c:2974
+#: g10/g10.c:2972
 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/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, 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/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, 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/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [anell]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepci� des del servidor de claus ha fallat: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportaci� de la clau ha fallat: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersi� �s inv�lid �%s�\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1783,23 +1706,23 @@
 "un nom de notaci� nom�s pot tenir car�cters imprimibles o espais i "
 "acabar amb el signe �=�\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notaci� d'usuari no pot contenir el car�cter �@�\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci� no pot utilitzar cap car�cter de control\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de pol�tica de certificaci� donada no �s v�lida\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de pol�tica de signatura donada no �s v�lida\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de pol�tica de signatura donada no �s v�lida\n"
@@ -2706,14 +2629,14 @@
 msgstr "L'ID d'usuari �%s� est� revocat."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  No es pot signar.\n"
 
@@ -2916,7 +2839,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2970,18 +2893,10 @@
 msgstr "s'est� posant la signatura al lloc correcte\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "desa"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "desa i ix"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "mostra empremta"
 
@@ -2989,10 +2904,6 @@
 msgid "list key and user IDs"
 msgstr "llista claus i ID"
 
-#: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
 # 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:1253
@@ -3000,507 +2911,363 @@
 msgstr "tria l'ID d'usuari N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "clau"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "tria la clau secund�ria N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "comprova"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "llista les signatures"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "signa la clau"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "sign"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "crea una signatura separada"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "signa la clau localment"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "signa la clau irrevocablement"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "signa la clau localment i irrevocablement"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "afegeix un ID d'usuari"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
-
 # Com estava escrit abans.  ivb
 # 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:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "afegeix un photo ID"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "esborra un ID d'usuari"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "afegeix una clau secund�ria"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "esborra una clau secund�ria"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "afegeix una clau de revocaci�"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "esborra signatures"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "canvia la data de caducitat"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primari"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "marca l'ID d'usuari com a primari"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "canvia entre el llistat de claus secretes i p�bliques"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "llista les prefer�ncies (expert)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "llista les prefer�ncies (detallat)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "estableix la llista de prefer�ncies"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "prefer�ncies actualitzades"
 
-# �del servidor�, �en el servidor�?  ivb
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "error de servidor de claus"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr ""
 "no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "canvia la confian�a"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "revoca signatures"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "revoca un ID d'usuari"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "revoca una clau secund�ria"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "desactiva una clau"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "activa una clau"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
 # Igual que dalt.  ivb
 # Idem :) jm
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "mostra el photo ID"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, 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:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "La clau secreta est� disponible.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Cal la clau secreta per a fer a��.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Useu l'ordre �toggle� abans.\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "La clau est� revocada."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realment voleu signar tots els ID d'usuari? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, 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:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "No podeu esborrar l'�ltim ID d'usuari!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Heu de seleccionar, si m�s no, una clau.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Heu de seleccionar, si m�s no, una clau.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Realment voleu eliminar aquesta clau? "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Realment voleu revocar les claus seleccionades? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estableix la llista de prefer�ncies"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, 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:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realment voleu actualitzar les prefer�ncies? "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualitzaci�: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ha fallat l'actualitzaci� de la clau secreta: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualitzaci�.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
 # Potser %s haja d'anar darrere de �clau�.  ivb
 # �s cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, 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:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 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"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3509,19 +3276,19 @@
 "necess�riament\n"
 "correcta a no ser que torneu a executar el programa.\n"
 
-#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3531,7 +3298,7 @@
 "assumida.\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3540,49 +3307,49 @@
 "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:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 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:2607
+#: g10/keyedit.c:2608
 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:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura inv�lida? (s/N/x)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3592,168 +3359,168 @@
 "pot\n"
 "fer que algunes versions de PGP rebutjen aquesta clau.\n"
 
-#: g10/keyedit.c:2885
+#: g10/keyedit.c:2886
 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:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introdu�u l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 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:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AV�S: Aquesta clau ha estat revocada pel propietari!\n"
 
-#: g10/keyedit.c:2984
+#: g10/keyedit.c:2985
 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:2990
+#: g10/keyedit.c:2991
 #, 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:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secund�ria.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "S'est� canviant la data de caducitat per a una clau secund�ria.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 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:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, 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:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3497
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'�ndex %d\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hi ha cap clau secund�ria amb l'�ndex %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: �"
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   signat per %08lX el %s%s%s\n"
 
-#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 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:3738
+#: g10/keyedit.c:3739
 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:3765
+#: g10/keyedit.c:3766
 #, 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:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocaci�? (s/N) "
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari �%s� ja est� revocat\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, 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:4126
+#: g10/keyedit.c:4127
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4087,7 +3854,7 @@
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4361,7 +4128,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opcions d'exportaci� no v�lides\n"
@@ -4376,108 +4143,108 @@
 msgid "key not found on keyserver\n"
 msgstr "no s'ha trobat la clau �%s�: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, 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:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "s'est� sol�licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, 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:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "�\n"
 "signat amb la vostra clau %08lX el %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, 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:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s'est� cercant �%s� al servidor HKP %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opcions d'exportaci� no v�lides\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no es coneix cap servidor de claus (useu l'opci� \"--keyserver\")\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
 # �del servidor�, �en el servidor�?  ivb
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "error de servidor de claus"
 
 # �del servidor�, �en el servidor�?  ivb
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "la recepci� des del servidor de claus ha fallat: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no �s un ID v�lid\n"
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, 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:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "s'est� sol�licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "s'est� sol�licitant la clau %08lX de %s\n"
@@ -4663,7 +4430,7 @@
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "desconeguda"
 
@@ -4851,46 +4618,46 @@
 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:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent no est� disponible en aquesta sessi�\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "no es pot establir el pid del client per l'agent\n"
 
 # llija/llegisca/llegesca.  ivb
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "no es pot fer que el servidor llegesca el DF per a l'agent\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "no es pot fer que el servidor escriga el DF per a l'agent\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO �s malformada\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, 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:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb �%s�: %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "hi ha un problema de comunicaci� amb el gpg-agent\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 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:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de la clau principal %08lX)"
@@ -4906,7 +4673,7 @@
 # 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:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4917,41 +4684,41 @@
 "�%2$.*1$s�\n"
 "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Repetiu la contrasenya\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Introdu�u la contrasenya\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "la contrasenya �s massa llarga\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "la resposta de l'agent �s inv�lida\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "s'ha cancel�lat per l'usuari\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, 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:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Introdu�u la contrasenya: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4961,17 +4728,17 @@
 "Necessiteu la contrasenya per desblocar la clau secreta de\n"
 "l'usuari: \""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, 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:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Repetiu la contrasenya: "
 
@@ -5886,12 +5653,12 @@
 "la base de dades de confian�a est� corrompuda; per favor, executeu "
 "�gpg --fix-trustdb�.\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "la l�nia d'entrada �s superior a %d car�cters\n"
@@ -5952,7 +5719,7 @@
 msgid "[ revoked]"
 msgstr "[revocada]"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada]"
@@ -5962,109 +5729,109 @@
 msgid "[ unknown]"
 msgstr "desconeguda"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: 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:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, 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:589
+#: 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:604
+#: 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:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, 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:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "si us plau, feu un --check-trustdb\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "s'est� comprovant la base de dades de confian�a\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, 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:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "no s'han trobat claus amb confian�a absoluta\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, 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:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, 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"
@@ -6356,6 +6123,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "ix"
+
 # �xX�?  ivb
 #: util/miscutil.c:351
 msgid "qQ"
@@ -6397,6 +6168,159 @@
 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 "q"
+#~ msgstr "q"
+
+#~ msgid "help"
+#~ msgstr "ajuda"
+
+#~ msgid "list"
+#~ msgstr "llista"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "depura"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsign"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fpr"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "error general"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "desa"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "clau"
+
+#~ msgid "check"
+#~ msgstr "comprova"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "sign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "addkey"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "primari"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+# �del servidor�, �en el servidor�?  ivb
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "error de servidor de claus"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr ""
 #~ "l'algorisme de resum �%s� es de nom�s lectura en aquesta versi�\n"
Index: gnupg/po/cs.po
diff -u gnupg/po/cs.po:1.13 gnupg/po/cs.po:1.14
--- gnupg/po/cs.po:1.13	Fri Dec 10 23:21:01 2004
+++ gnupg/po/cs.po	Tue Dec 14 08:49:27 2004
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <rp at tns.cz>\n"
 "Language-Team: Czech <translations.cs at gnupg.cz>\n"
@@ -29,7 +29,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -351,7 +351,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta èíslo %s\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 msgid "can't do this in batch mode\n"
 msgstr "nelze provést v dávkovém módu\n"
@@ -545,151 +545,79 @@
 msgid "secret key already stored on a card\n"
 msgstr "tajný klíè je na kartì ulo¾en\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "ukonèit"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "ukonèit toto menu"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "u"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr "admin"
-
 #: g10/card-util.c:1252
 msgid "show admin commands"
 msgstr "zobraz administrátorské pøíkazy"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "help"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "ukázat tuto pomoc"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "list"
-
 #: g10/card-util.c:1255
 msgid "list all available data"
 msgstr "vypi¹ v¹echna dostupná data"
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "debug"
-
-#: g10/card-util.c:1258
-msgid "name"
-msgstr "jméno"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr "zmìní jméno majitele karty"
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr "url"
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr "zmìní URL pro záskání klíèe"
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr "fetch"
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr "získá klíè specifikovaný v URL karty"
 
-#: g10/card-util.c:1262
-msgid "login"
-msgstr "login"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 msgid "change the login name"
 msgstr "zmìnit login name"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr "lang"
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 msgid "change the language preferences"
 msgstr "zmìnit jazykové pøedvolby"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr "sex"
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr "zmìní pohlaví dr¾itele karty"
 
-#: g10/card-util.c:1265
-msgid "cafpr"
-msgstr "cafpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 msgid "change a CA fingerprint"
 msgstr "vypsat fingerprint certifikaèní autority"
 
-#: g10/card-util.c:1266
-msgid "forcesig"
-msgstr "forcesig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 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:1268
-msgid "generate"
-msgstr "generate"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 msgid "generate new keys"
 msgstr "vytvoøit nový pár klíèù"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr "nabídka pro zmìnu anebo odblokování PINu"
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Pøíkaz> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 msgid "Admin-only command\n"
 msgstr "pouze administrátorské pøíkazy\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 msgid "Admin commands are allowed\n"
 msgstr "administrátorské pøíkazy jsou povoleny\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 msgid "Admin commands are not allowed\n"
 msgstr "administrátorské pøíkazy nejsou povoleny\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatný pøíkaz (zkuste \"help\")\n"
 
@@ -740,7 +668,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo není zopakováno správnì; zkuste to znovu"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -750,13 +678,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento pøíkaz není platný\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klíè \"%s\" nenalezen: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1213,7 +1141,7 @@
 msgid "Pubkey: "
 msgstr "Veøejný klíè: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "©ifra: "
 
@@ -1221,7 +1149,7 @@
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Komprese: "
 
@@ -1344,7 +1272,7 @@
 msgid "reading options from `%s'\n"
 msgstr "ètu mo¾nosti z `%s'\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZNÁMKA: %s není pro normální pou¾ití!\n"
@@ -1356,332 +1284,332 @@
 "¹ifra `%s' nebyla nahrána, proto¾e pøístupová práva nejsou nastavena "
 "bezpeènì\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' není platná znaková sada\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru klíèù\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatný parametr pro server klíèù\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 msgid "invalid keyserver options\n"
 msgstr "neplatný parametr pro server klíèù\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatný parametr pro import\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "neplatný parametr pro import\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatný parametr pro export\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "neplatný parametr pro export\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatný parametr pro výpis\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 msgid "invalid list options\n"
 msgstr "neplatný parametr pro výpis\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatný parametr pro ovìøení\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 msgid "invalid verify options\n"
 msgstr "neplatný parametr pro ovìøení\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVÁNÍ: program mù¾e vytvoøit soubor core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVÁNÍ: %s pøepí¹e %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Není dovoleno pou¾ívat %s s %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedává s %s smysl!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 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/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 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/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný ¹ifrovací algoritmus je neplatný\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybraný komprimovací algoritmus je neplatný\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo¾ka completes-needed musí být vìt¹í ne¾ 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo¾ka marginals-needed musí být vìt¹í ne¾ 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 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/g10.c:2744
+#: g10/g10.c:2742
 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/g10.c:2746
+#: g10/g10.c:2744
 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/g10.c:2749
+#: g10/g10.c:2747
 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/g10.c:2753
+#: g10/g10.c:2751
 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/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "neplatné defaultní pøedvolby\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné u¾ivatelské pøedvolby pro ¹ifrování\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné u¾ivatelské pøedvolby pro hashování\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné u¾ivatelské pøedvolby pro komprimaci\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud není funkèní s %s\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, 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/g10.c:2862
+#: g10/g10.c:2860
 #, 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/g10.c:2867
+#: g10/g10.c:2865
 #, 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/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat databázi dùvìry: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 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/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [jméno souboru]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jméno souboru]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrické ¹ifrování `%s' se nepovedlo: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jméno souboru]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jméno souboru]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 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/g10.c:3022
+#: g10/g10.c:3020
 #, 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/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [jméno souboru]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jméno souboru]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jméno souboru]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 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/g10.c:3073
+#: g10/g10.c:3071
 #, 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/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jméno souboru]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jméno souboru]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jméno souboru]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key id u¾ivatele"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u¾ivatele"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id u¾ivatele"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id u¾ivatele"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u¾ivatele [pøíkazy]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u¾ivatele] [soubor s klíèi (keyring)]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odeslání na keyserver se nezdaøilo: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "získání dat z keyserveru se nezdaøilo: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export klíèe se nepodaøil: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hledání na keyserveru se nezdaøilo: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezdaøil: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódování z ASCII formátu selhalo: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódování do ASCII formátu selhalo: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[jméno souboru]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Zaènìte psát svou zprávu ...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1689,23 +1617,23 @@
 "symbolické jméno smí obsahovat pouze písmena, èíslice, teèky nebo podtr¾ítka "
 "a musí konèit znakem '='\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "jméno u¾ivatele musí obsahovat znakt '@' \n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nemù¾e obsahovat ¾ádné kontrolní znaky\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pro certifikaèní politiku je neplatné\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pro podepisovací politiku je neplatné\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadané URL preferovaného serveru klíèù je neplaté\n"
 
@@ -2578,12 +2506,12 @@
 msgstr "U¾ivatelské ID \"%s\" je revokováno."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
@@ -2763,7 +2691,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Skuteènì podepsat? (a/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2815,18 +2743,10 @@
 msgstr "pøesunuji podpis klíèe na správné místo\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "ulo¾it"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "ulo¾it a ukonèit"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "vypsat fingerprint"
 
@@ -2835,485 +2755,341 @@
 msgstr "vypsat seznam klíèù a id u¾ivatelù"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "vyberte identifikátor u¾ivatele N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "key"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "vyberte sekundární klíè N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "check"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "vypsat seznam podpisù"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "podepsat klíè"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-msgid "tsign"
-msgstr "tsign"
-
 #: g10/keyedit.c:1259
 msgid "make a trust signature"
 msgstr "vytvoøit trust signature"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "podepsat klíè lokálnì"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "podepsat klíè bez mo¾nosti odvolat podpis (non-revocably)"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "podepsat klíè lokálnì a  bez mo¾nosti odvolat podpis (non-revocably)"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "pøidat identifikátor u¾ivatele"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "pøidat fotografický ID"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "smazat identifikátor u¾ivatele"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "pøidat sekundární klíè"
 
-#: g10/keyedit.c:1271
-msgid "addcardkey"
-msgstr "addcardkey"
-
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1272
 msgid "add a key to a smartcard"
 msgstr "pøidat klíè na kartu"
 
-#: g10/keyedit.c:1272
-msgid "keytocard"
-msgstr "keytocard"
-
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr "pøesunout klíè na kartu"
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "smazat sekundární klíè"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "pøidat revokaèní klíè"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "smazat podpisy"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "zmìnit dobu platnosti"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primary"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "oznaèit u¾ivatelské ID jako primární"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "pøepnout mezi vypsáním seznamu tajných a veøejných klíèù"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "vypsat seznam pøedvoleb (pro experty)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam pøedvoleb (podrobnì)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "nastavit seznam pøedvoleb"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "aktualizovat pøedvolby"
 
-#: g10/keyedit.c:1286
-msgid "keyserver"
-msgstr "keyserver"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 msgid "set preferred keyserver URL"
 msgstr "nastavit URL pro preferovaný server klíèù"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "zmìnit heslo"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "zmìnit dùvìryhodnost vlastníka klíèe"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "revokovat podpisy"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "odvolat platnost id u¾ivatele"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "revokovat sekundární klíè"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "nastavit klíè jako neplatný (disable)"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "nastavit klíè jako platný (enable)"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "ukázat fotografický ID"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, 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:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Tajný klíè je dostupný.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Pro provedení této operace je potøeba tajný klíè.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Prosím, nejdøíve pou¾ijte pøíkaz \"toggle\" (pøepnout).\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "Klíè revokován."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Opravdu podepsat v¹echny id u¾ivatele? (a/N) "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Nápovìda: Vyberte id u¾ivatele k podepsání\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, 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:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "Musíte vybrat alespoò jeden id u¾ivatele.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "Nemù¾ete smazat poslední id u¾ivatele!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Opravdu odstranit v¹echny vybrané id u¾ivatele? (a/N) "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 msgid "Really remove this user ID? (y/N) "
 msgstr "Opravdu odstranit tento id u¾ivatele? (a/N) "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 msgid "Really move the primary key? (y/N) "
 msgstr "Opravdu pøesunout primární klíè? (a/N) "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 msgid "You must select exactly one key.\n"
 msgstr "Musíte vybrat právì jeden klíè.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Musíte vybrat alespoò jeden klíè.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Opravdu chcete smazat vybrané klíèe? (a/N) "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Opravdu chcete smazat tento klíè? (a/N) "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Opravdu revokovat v¹echny vybrané id u¾ivatele? (a/N) "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Opravdu revokovat tento id u¾ivatele? (a/N) "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Opravdu chcete revokovat vybrané klíèe? (a/N) "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Opravdu chcete revokovat tento klíè? (a/N) "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 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:1767
+#: g10/keyedit.c:1768
 msgid "Set preference list to:\n"
 msgstr "Nastavit seznam pøedvoleb:\n"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 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:1775
+#: g10/keyedit.c:1776
 msgid "Really update the preferences? (y/N) "
 msgstr "Opravdu aktualizovat pøedvolby? (a/N) "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 msgid "Save changes? (y/N) "
 msgstr "Ulo¾it zmìny? (a/N) "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 msgid "Quit without saving? (y/N) "
 msgstr "Ukonèit bez ulo¾ení? (a/N) "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajného klíèe selhala: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 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:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr "Preferovaný keyserver: "
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento klíè mù¾e být revokován klíèem %s "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citlivá informace)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, c-format
 msgid "created: %s"
 msgstr "vytvoøen: %s"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, c-format
 msgid "revoked: %s"
 msgstr "revokován: %s"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skonèila: %s"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skonèí: %s"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, c-format
 msgid "usage: %s"
 msgstr "pou¾ití: %s"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, c-format
 msgid "trust: %s"
 msgstr "dùvìra: %s"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Tento klíè byl oznaèen za neplatný (disabled)"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr "èíslo karty: "
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 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:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3321,17 +3097,17 @@
 "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:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 msgid "revoked"
 msgstr "revokován"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 msgid "expired"
 msgstr "platnost skonèila"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3339,7 +3115,7 @@
 "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:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3348,45 +3124,45 @@
 "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:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 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:2607
+#: g10/keyedit.c:2608
 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:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobrý podpis? (a/N/u)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatný podpis? (a/N/u)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento neznámý podpis? (a/N/u)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smazán %d podpis.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smazáno %d podpisù.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smazáno.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3395,155 +3171,155 @@
 "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:2885
+#: g10/keyedit.c:2886
 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:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo¾te identifikátor u¾ivatele povìøeného revokací: "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 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:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento klíè ji¾ bykl povìøen revokací\n"
 
-#: g10/keyedit.c:2984
+#: g10/keyedit.c:2985
 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:2990
+#: g10/keyedit.c:2991
 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:3051
+#: g10/keyedit.c:3052
 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:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Prosím, vyberte nejvý¹e jeden sekundární klíè.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Mìním dobu platnosti sekundárního klíèe.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Mìním dobu platnosti primárního klíèe.\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajných klíèù chybí odpovídající podpis\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosím, vyberte právì jeden id u¾ivatele .\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, 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:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vlo¾te URL preferovaného keyserveru: "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 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:3496
+#: g10/keyedit.c:3497
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jistý(á), ¾e jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor u¾ivatele s indexem %d\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Neexistuje sekundární klíè s indexem %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u¾ivatele:\"%s\"\n"
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, 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:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (neexportovatelné)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr¹í %s.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 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:3738
+#: g10/keyedit.c:3739
 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:3765
+#: g10/keyedit.c:3766
 #, 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:3791
+#: g10/keyedit.c:3792
 msgid " (non-revocable)"
 msgstr " (nerevokovatelné)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, 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:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvoøit revokaèní certifikáty? (a/N) "
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "neexistuje tajný klíè\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U¾ivatelské ID \"%s\" je ji¾ revokováno.\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, 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:4126
+#: g10/keyedit.c:4127
 #, 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"
@@ -3866,7 +3642,7 @@
 "Pro ochranu Va¹eho tajného klíèe musíte zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4126,7 +3902,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Vlo¾te èíslo (èísla), 'N' pro dal¹í nebo 'Q' pro konec> "
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatný protokol serveru klíèù (us %d!=handler %d)\n"
@@ -4140,101 +3916,101 @@
 msgid "key not found on keyserver\n"
 msgstr "klíè nebyl na serveru klíèù nalezen\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po¾aduji klíè %s ze %s server %s\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po¾aduji klíè %s z %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, 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:1049
+#: g10/keyserver.c:1054
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "posílám klíè %s na %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyhledávám \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyhledávám \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 msgid "no keyserver action!\n"
 msgstr "¾ádná operace se serverem klíèù!\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, 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:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr "server klíèù neposlal VERSION\n"
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "¾adný server klíèù není znám (pou¾íjte volbu --keyserver)\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 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:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "protokol serveru klíèù `%s' není podporován\n"
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, 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:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr "gpgkeys_%s nepodporuje protokol verze  %d\n"
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 msgid "keyserver timed out\n"
 msgstr "èasový limit pro server klíèù vypr¹el\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 msgid "keyserver internal error\n"
 msgstr "interní chyba serveru klíèù\n"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "chyba komunikace se serverem klíèù: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" není ID klíèe: pøeskoèeno\n"
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, 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:1600
+#: g10/keyserver.c:1607
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "aktualizuji 1 klíè z %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "aktualizuji %d klíèù z %s\n"
@@ -4418,7 +4194,7 @@
 msgid "textmode"
 msgstr "textový formát"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "neznámý formát"
 
@@ -4590,50 +4366,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d má nastavený kritický bit\n"
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent není v tomto sezení dostupný\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "nemohu nastavit PID klienta pro gpg-agenta\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "nelze získat server read file descriptor pro agenta r\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "nezle získat server write file descriptor pro agenta\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "¹patný formát promìnné prostøedí GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, 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:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nemohu se pøipojit k `%s': %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "problém v komunikaci s gpg-agentem\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problém s agentem - pou¾ívání agenta vypnuto\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(hlavní ID klíèe %s)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4644,41 +4420,41 @@
 "\"%.*s\"\n"
 "Klíè o délce %u bitù, typ %s, ID %s, vytvoøený %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Opakovat heslo\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Vlo¾it heslo\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "heslo je pøíli¹ dlouhé\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "neplatná reakce od agenta\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "zru¹eno u¾ivatelem\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problém s agentem: agent vrací 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "v dávkovém re¾imu se nemohu ptát na heslo\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Vlo¾te heslo: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4687,17 +4463,17 @@
 "Musíte znát heslo, abyste odemknul(a) tajný klíè pro\n"
 "u¾ivatele: \"%s\"\n"
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, 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:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (podklíè na hlavním klíèi ID %s)"
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
@@ -5566,12 +5342,12 @@
 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:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "vstupní øádek je del¹í ne¾ %d znakù\n"
@@ -5631,7 +5407,7 @@
 msgid "[ revoked]"
 msgstr "revokován"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "platnost skonèila"
@@ -5641,96 +5417,96 @@
 msgid "[ unknown]"
 msgstr "neznámý formát"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 #, fuzzy
 msgid "[marginal]"
 msgstr "èásteèná"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 #, fuzzy
 msgid "[ultimate]"
 msgstr "absolutní"
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "nedefinován"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "¾ádná"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "èásteèná"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "plná"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "absolutní"
 
-#: g10/trustdb.c:574
+#: 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:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal¹í kontrola databáze dùvìry v %s\n"
 
-#: g10/trustdb.c:589
+#: 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:604
+#: 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:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "veøejný klíè %s nebyl nalezen: %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "prosím proveïte --check-trustdb\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "kontroluji databázi dùvìry\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "zpracováno %d klíèù (%d validit vymazáno)\n"
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "¾ádný absolutnì dùvìryhodný klíè nebyl nalezen\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, 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:1986
+#: g10/trustdb.c:1987
 #, 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:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5738,7 +5514,7 @@
 "hloubka: %d  platných: %3d  podepsaných: %3d  dùvìra: %d-, %dq, %dn, %dm, %"
 "df, %du\n"
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, 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"
@@ -6008,6 +5784,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "ukonèit"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "uUqQ"
@@ -6044,6 +5824,168 @@
 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 "q"
+#~ msgstr "u"
+
+#~ msgid "admin"
+#~ msgstr "admin"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "list"
+#~ msgstr "list"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#~ msgid "name"
+#~ msgstr "jméno"
+
+#~ msgid "url"
+#~ msgstr "url"
+
+#~ msgid "fetch"
+#~ msgstr "fetch"
+
+#~ msgid "login"
+#~ msgstr "login"
+
+#~ msgid "lang"
+#~ msgstr "lang"
+
+#~ msgid "sex"
+#~ msgstr "sex"
+
+#~ msgid "cafpr"
+#~ msgstr "cafpr"
+
+#~ msgid "forcesig"
+#~ msgstr "forcesig"
+
+#~ msgid "generate"
+#~ msgstr "generate"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "ulo¾it"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "key"
+
+#~ msgid "check"
+#~ msgstr "check"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "tsign"
+#~ msgstr "tsign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#~ msgid "addcardkey"
+#~ msgstr "addcardkey"
+
+#~ msgid "keytocard"
+#~ msgstr "keytocard"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "primary"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#~ msgid "keyserver"
+#~ msgstr "keyserver"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "hashovací algoritmus `%s' je v tomto release read-only\n"
 
Index: gnupg/po/da.po
diff -u gnupg/po/da.po:1.18 gnupg/po/da.po:1.19
--- gnupg/po/da.po:1.18	Fri Dec 10 23:21:01 2004
+++ gnupg/po/da.po	Tue Dec 14 08:49:27 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <birger.langkjer at image.dk>\n"
 "Language-Team: Danish <dansk at klid.dk>\n"
@@ -32,7 +32,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -352,7 +352,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 msgid "can't do this in batch mode\n"
 msgstr ""
@@ -563,164 +563,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig nøgle er allerede tilstede\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "afslut"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "a"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "hjælp"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "vis denne hjælp"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "vis"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Ingen hjælp tilgængelig"
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "aflus"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "slåtil"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsignér"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "ændr udløbsdatoen"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "vis præferencer"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/card-util.c:1266
-msgid "forcesig"
-msgstr ""
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "generel fejl"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "generér et nyt nøglepar"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "kodeord"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr ""
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
@@ -768,7 +692,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "kodesætningen blev ikke ordentlig gentaget; prøv igen.\n"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -778,13 +702,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -1234,7 +1158,7 @@
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr ""
 
@@ -1242,7 +1166,7 @@
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
@@ -1347,7 +1271,7 @@
 msgid "reading options from `%s'\n"
 msgstr "læser indstillinger fra `%s'\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
@@ -1357,370 +1281,370 @@
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegnsæt\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "importér nøgler fra en nøgleserver: %s\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig nøglering"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig nøglering"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig nøglering"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsløs sammen med %s!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2616
+#: g10/g10.c:2614
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2622
+#: g10/g10.c:2620
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2635
+#: g10/g10.c:2633
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resuméalgoritme er ugyldig\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resuméalgoritme er ugyldig\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:2744
+#: g10/g10.c:2742
 #, 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/g10.c:2746
+#: g10/g10.c:2744
 #, 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/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frarådes på det skarpeste\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal være 0, 1 el. 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis præferencer"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis præferencer"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis præferencer"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis præferencer"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsløs sammen med %s!\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2862
+#: g10/g10.c:2860
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2867
+#: g10/g10.c:2865
 #, 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/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3093
+#: g10/g10.c:3091
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [nøglering]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "påklædning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "påklædning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "påklædning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "påklædning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Gå til sagen og skriv meddelelsen ...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -2483,13 +2407,13 @@
 msgstr "Nøglen er beskyttet.\n"
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 #, 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -2657,7 +2581,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2708,18 +2632,10 @@
 msgstr ""
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "gem"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "gem og afslut"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "vis fingeraftryk"
 
@@ -2728,752 +2644,598 @@
 msgstr "vis nøgler og bruger-id'er"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr ""
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "nøgle"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "vælg sekundær nøgle N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "tjek"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "vis signaturer"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "signér"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "signér nøglen"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "signér"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "opret en separat signatur"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsignér"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "signér nøglen lokalt"
 
 #: g10/keyedit.c:1261
 #, fuzzy
-msgid "nrsign"
-msgstr "signér"
-
-#: g10/keyedit.c:1261
-#, fuzzy
 msgid "sign the key non-revocably"
 msgstr "signér nøglen lokalt"
 
 #: g10/keyedit.c:1262
 #, fuzzy
-msgid "nrlsign"
-msgstr "signér"
-
-#: g10/keyedit.c:1262
-#, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "signér nøglen lokalt"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "tilføj-bid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "tilføj bruger-id"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr ""
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilføj bruger-id"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "sletbid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "slet bruger id"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr ""
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "tilføj nøgle"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "tilføj sekundær nøgle"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "tilføj nøgle"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "sletnøgle"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "slet sekundær nøgle"
 
-#: g10/keyedit.c:1275
-#, fuzzy
-msgid "addrevoker"
-msgstr "tilføj nøgle"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 #, fuzzy
 msgid "add a revocation key"
 msgstr "tilføj sekundær nøgle"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "sletsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "slet signaturer"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "udløb"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "ændr udløbsdatoen"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr ""
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "skift"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "skift imellem hemmelig og offentlig nøgle visning"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "s"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "præf"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis præferencer"
 
-#: g10/keyedit.c:1283
-#, fuzzy
-msgid "showpref"
-msgstr "vispræf"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis præferencer"
 
-#: g10/keyedit.c:1284
-#, fuzzy
-msgid "setpref"
-msgstr "præf"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 #, fuzzy
 msgid "set preference list"
 msgstr "vis præferencer"
 
-#: g10/keyedit.c:1285
-#, fuzzy
-msgid "updpref"
-msgstr "præf"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 #, fuzzy
 msgid "updated preferences"
 msgstr "vis præferencer"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "generel fejl"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 msgid "set preferred keyserver URL"
 msgstr ""
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "ændr kodesætningen"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "betro"
-
-#: g10/keyedit.c:1288
-msgid "change the ownertrust"
-msgstr ""
-
 #: g10/keyedit.c:1289
-msgid "revsig"
+msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr ""
 
-#: g10/keyedit.c:1290
-#, fuzzy
-msgid "revuid"
-msgstr "sletbid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 #, fuzzy
 msgid "revoke a user ID"
 msgstr "tilføj bruger-id"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr ""
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr ""
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "slåfra"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "slå nøgle fra"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "slåtil"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "slå nøgle til"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr ""
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fejl ved læsning af '%s': %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 #, fuzzy
 msgid "Key is revoked."
 msgstr "Nøglen er beskyttet.\n"
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, 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:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig gerne gøre dette?"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsnøgle? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Vil du virkelig gerne gøre dette?"
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "vis præferencer"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Generér en annullérbar certifikat"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Generér en annullérbar certifikat"
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gem ændringer? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, 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:2251
+#: g10/keyedit.c:2252
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilføj nøgle"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "Nøgle udløber d. %s\n"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "Nøgle udløber d. %s\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "tilføj nøgle"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "udløb"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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:2596
+#: g10/keyedit.c:2597
 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:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 #, 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:2607
+#: g10/keyedit.c:2608
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 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:2885
+#: g10/keyedit.c:2886
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2905
+#: g10/keyedit.c:2906
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast nøglens størrelse"
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2943
+#: g10/keyedit.c:2944
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2965
+#: g10/keyedit.c:2966
 #, 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:2984
+#: g10/keyedit.c:2985
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:2990
+#: g10/keyedit.c:2991
 #, 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:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, 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:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, 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:3496
+#: g10/keyedit.c:3497
 #, 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:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekundær nøgle med indeks %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne nøgle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 #, 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:3738
+#: g10/keyedit.c:3739
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Generér en annullérbar certifikat"
 
-#: g10/keyedit.c:3765
+#: g10/keyedit.c:3766
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "signér en nøgle lokalt"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, 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:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Generér en annullérbar certifikat"
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Nøglen er beskyttet.\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3784,7 +3546,7 @@
 "Du skal bruge en kodesætning til at beskytte din hemmelige nøgle.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr ""
@@ -4038,7 +3800,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ugyldig nøglering"
@@ -4053,104 +3815,104 @@
 msgid "key not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, 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:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "importér nøgler fra en nøgleserver: %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "importér nøgler fra en nøgleserver: %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "eksportér nøgler til en nøgletjener"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "læser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "ugyldig nøglering"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "påklædning af beskyttelse fejlede: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s er ikke et gyldigt tegnsæt\n"
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "importér nøgler fra en nøgleserver: %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "importér nøgler fra en nøgleserver: %s\n"
@@ -4331,7 +4093,7 @@
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 #, fuzzy
 msgid "unknown"
 msgstr "ukendt version"
@@ -4505,50 +4267,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/passphrase.c:565
+#: g10/passphrase.c:568
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hovednøgle-ID %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4556,42 +4318,42 @@
 "%u-bit %s key, ID %s, created %s%s\n"
 msgstr ""
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Gentag kodesætning: "
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Indtast kodesætning: "
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr ""
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 msgid "can't query passphrase in batch mode\n"
 msgstr ""
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Indtast kodesætning: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4600,17 +4362,17 @@
 "Du skal bruge en kodesætning til at beskytte din hemmelige nøgle.\n"
 "\n"
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr ""
 
-#: g10/passphrase.c:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Gentag kodesætning: "
 
@@ -5459,12 +5221,12 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
@@ -5523,7 +5285,7 @@
 msgid "[ revoked]"
 msgstr "tilføj nøgle"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "udløb"
@@ -5533,101 +5295,101 @@
 msgid "[ unknown]"
 msgstr "ukendt version"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:604
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "offentlig nøgle ikke fundet"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -5898,6 +5660,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "afslut"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "aA"
@@ -5936,6 +5702,143 @@
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 
+#~ msgid "q"
+#~ msgstr "a"
+
+#~ msgid "help"
+#~ msgstr "hjælp"
+
+#~ msgid "list"
+#~ msgstr "vis"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "aflus"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "slåtil"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsignér"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fpr"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "generel fejl"
+
+#~ msgid "passwd"
+#~ msgstr "kodeord"
+
+#~ msgid "save"
+#~ msgstr "gem"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "nøgle"
+
+#~ msgid "check"
+#~ msgstr "tjek"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "signér"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "signér"
+
+#~ msgid "lsign"
+#~ msgstr "lsignér"
+
+#, fuzzy
+#~ msgid "nrsign"
+#~ msgstr "signér"
+
+#, fuzzy
+#~ msgid "nrlsign"
+#~ msgstr "signér"
+
+#~ msgid "adduid"
+#~ msgstr "tilføj-bid"
+
+#~ msgid "deluid"
+#~ msgstr "sletbid"
+
+#~ msgid "addkey"
+#~ msgstr "tilføj nøgle"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "tilføj nøgle"
+
+#~ msgid "delkey"
+#~ msgstr "sletnøgle"
+
+#, fuzzy
+#~ msgid "addrevoker"
+#~ msgstr "tilføj nøgle"
+
+#~ msgid "delsig"
+#~ msgstr "sletsig"
+
+#~ msgid "expire"
+#~ msgstr "udløb"
+
+#~ msgid "toggle"
+#~ msgstr "skift"
+
+#~ msgid "t"
+#~ msgstr "s"
+
+#~ msgid "pref"
+#~ msgstr "præf"
+
+#, fuzzy
+#~ msgid "showpref"
+#~ msgstr "vispræf"
+
+#, fuzzy
+#~ msgid "setpref"
+#~ msgstr "præf"
+
+#, fuzzy
+#~ msgid "updpref"
+#~ msgstr "præf"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "generel fejl"
+
+#~ msgid "trust"
+#~ msgstr "betro"
+
+#, fuzzy
+#~ msgid "revuid"
+#~ msgstr "sletbid"
+
+#~ msgid "disable"
+#~ msgstr "slåfra"
+
+#~ msgid "enable"
+#~ msgstr "slåtil"
+
 #~ msgid "DSA only allows keysizes from 512 to 1024\n"
 #~ msgstr "DSA tillader kun nøglestørrelser fra 512 til 1024\n"
 
Index: gnupg/po/de.po
diff -u gnupg/po/de.po:1.98 gnupg/po/de.po:1.99
--- gnupg/po/de.po:1.98	Fri Dec 10 23:20:54 2004
+++ gnupg/po/de.po	Tue Dec 14 08:49:27 2004
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2004-10-05 10:11+0200\n"
 "Last-Translator: Walter Koch <koch at u32.de>\n"
 "Language-Team: German <de at li.org>\n"
@@ -29,7 +29,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -354,7 +354,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -567,165 +567,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "quit"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "Menü verlassen"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "q"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "Widersprüchliche Befehle\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "help"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "Liste der Schlüssel"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Schlüssel erhältlich bei: "
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "debug"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "enable"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsign"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "Ändern des Verfallsdatums"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "Den \"Owner trust\" ändern"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "Allgemeiner Fehler"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
@@ -773,7 +696,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -783,13 +706,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Kommando\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schlüssel `%s' nicht gefunden: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1264,7 +1187,7 @@
 msgid "Pubkey: "
 msgstr "Öff.Schlüssel: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "Verschlü.: "
 
@@ -1272,7 +1195,7 @@
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Komprimierung: "
 
@@ -1384,7 +1307,7 @@
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
@@ -1396,344 +1319,344 @@
 "Verschlüsselungserweiterung \"%s\" wurde wegen falscher Rechte nicht "
 "geladen\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ist kein gültiger Zeichensatz.\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Export Option.\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "Ungültige export Option\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import Option.\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "Ungültige Import Option\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export Option.\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "Ungültige export Option\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Import Option.\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "Ungültige Import Option\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Export Option.\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "Ungültige export Option\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 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/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 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/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen gröÂßer als 0 sein\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen gröÂßer als 1 sein\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, fuzzy
 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/g10.c:2744
+#: g10/g10.c:2742
 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/g10.c:2746
+#: g10/g10.c:2744
 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/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard Voreinstellungen\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, fuzzy, 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/g10.c:2862
+#: g10/g10.c:2860
 #, fuzzy, 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/g10.c:2867
+#: g10/g10.c:2865
 #, fuzzy, 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/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 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/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Entschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, 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/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, 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/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key User-ID"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key User-ID"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1741,23 +1664,23 @@
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und muß mit einem '=' enden\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
@@ -2661,12 +2584,12 @@
 msgstr "User-ID \"%s\" ist widerrufen."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht möglich.\n"
 
@@ -2872,7 +2795,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2925,18 +2848,10 @@
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "save"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "speichern und Menü verlassen"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
@@ -2945,503 +2860,357 @@
 msgstr "Schlüssel und User-IDs auflisten"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "User-ID N auswählen"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "key"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "Zweitschlüssel N auswählen"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "check"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "Liste der Signaturen"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "Den Schlüssel signieren"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-msgid "tsign"
-msgstr "tsign"
-
 #: g10/keyedit.c:1259
 msgid "make a trust signature"
 msgstr "Eine Trust-Unterschrift erzeugen"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "Den Schlüssel nur für diesen Rechner beglaubigen"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "Den Schlüssel nicht-widerrufbar beglaubigen"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "Den Schlüssel nicht-widerrufbar und nur für diesen Rechner signieren"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "Eine User-ID hinzufügen"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "Eine Foto-ID hinzufügen"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "User-ID entfernen"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "Einen Zweitschlüssel hinzufügen"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "Einen Zweitschlüssel entfernen"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "Einen Widerrufschlüssel hinzufügen"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "Signatur entfernen"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "Ändern des Verfallsdatums"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primary"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "Umschalten zwischen Anzeige geheimer und öffentlicher Schlüssel"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "Liste der Voreinstellungen (für Experten)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "Liste der Voreinstellungen (ausführlich)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "geänderte Voreinstellungen"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "Schlüsselserverfehler"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "Schlüsselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "Die Passphrase ändern"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" ändern"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "Eine User-ID widerrufen"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "Einen Zweitschlüssel widerrufen"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "Schlüssel abschalten"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "Schlüssel anschalten"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "Foto-ID anzeigen"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, 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:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schlüssel ist vorhanden.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schlüssel benötigt.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zunächst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "Schlüssel wurde widerrufen."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 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:1527
+#: g10/keyedit.c:1528
 #, 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:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gelöscht werden!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Möchten Sie alle ausgewählten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, 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:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Möchten Sie diesen Schlüssel wirklich entfernen? "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Möchten Sie wirklich alle ausgewählten User-IDs widerrufen? "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Diese User-ID wirklich widerrufen? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Möchten Sie die ausgewählten Schlüssel wirklich widerrufen? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Möchten Sie diesen Schlüssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, 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:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Die Voreinstellungen wirklich ändern? "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Änderungen speichern? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Änderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Änderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 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:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Eigenschaften: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, 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:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [verfällt: %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [verfällt: %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr "Gültigkeit: %s"
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 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:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3449,20 +3218,20 @@
 "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
 # translated by wk
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3470,7 +3239,7 @@
 "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:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3480,45 +3249,45 @@
 "könnte\n"
 "         bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
 
-#: g10/keyedit.c:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch hinzufügen? (j/N) "
 
-#: g10/keyedit.c:2607
+#: g10/keyedit.c:2608
 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:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3528,37 +3297,37 @@
 "         Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n"
 "         des Schlüssels führen.\n"
 
-#: g10/keyedit.c:2885
+#: g10/keyedit.c:2886
 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:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 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:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 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:2984
+#: g10/keyedit.c:2985
 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:2990
+#: g10/keyedit.c:2991
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3566,129 +3335,129 @@
 "Möchten Sie diesen Schlüssel wirklich als vorgesehenen Widerrufer "
 "deklarieren? (j/N): "
 
-#: g10/keyedit.c:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schlüsseln.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte wählen Sie höchstens einen Zweitschlüssel aus.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Ändern des Verfallsdatums des Zweitschlüssels.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID auswählen.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, 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:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3497
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschlüssel mit Index %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, 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:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:3738
+#: g10/keyedit.c:3739
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat für diese Unterschrift erzeugen (j/N)"
 
-#: g10/keyedit.c:3765
+#: g10/keyedit.c:3766
 #, 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:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, 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:4126
+#: g10/keyedit.c:4127
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4017,7 +3786,7 @@
 "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4281,7 +4050,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "Ungültige export Option\n"
@@ -4296,107 +4065,107 @@
 msgid "key not found on keyserver\n"
 msgstr "Schlüssel `%s' nicht gefunden: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "Schlüssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Schlüssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schlüssel %08lX um %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "Ungültige export Option\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "Schlüsselserverfehler"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "Schlüsselserverfehler"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, 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:1578
+#: g10/keyserver.c:1585
 #, 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:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Schlüssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Schlüssel %08lX wird von %s angefordert\n"
@@ -4579,7 +4348,7 @@
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -4755,51 +4524,51 @@
 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:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "Client-PID für den Agent kann nicht gesetzt werden\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "Server-Lese-Handle für den Agent nicht verfügbar\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "Server-Schreib-Handle für den Agent nicht verfügbar\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, 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:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunikationsproblem mit GPG-Agent\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 "Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (Hauptschlüssel-ID %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4810,41 +4579,41 @@
 "Benutzer: \"%.*s\"\n"
 "%u-bit %s Schlüssel, ID %s, erzeugt %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Geben Sie die Passphrase nochmal ein\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Geben Sie die Passphrase ein\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "Passphrase ist zu lang\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "Falsche Antwort des Agenten\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Geben Sie die Passphrase ein: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4854,17 +4623,17 @@
 "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, 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:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Geben Sie die Passphrase nochmal ein: "
 
@@ -5786,12 +5555,12 @@
 "Die \"Trust\"-Datenbank ist beschädigt; verwenden Sie \"gpg --fix-trustdb"
 "\".\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "Eingabezeile ist länger als %d Zeichen\n"
@@ -5852,7 +5621,7 @@
 msgid "[ revoked]"
 msgstr "[widerrufen]"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[verfallen]"
@@ -5862,106 +5631,106 @@
 msgid "[ unknown]"
 msgstr "unbekannt"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 #, fuzzy
 msgid "[marginal]"
 msgstr "marginal"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 #, fuzzy
 msgid "[ultimate]"
 msgstr "uneingeschränkt"
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "unbestimmt"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "niemals   "
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "vollständig"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "uneingeschränkt"
 
-#: g10/trustdb.c:574
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
 
-#: g10/trustdb.c:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
 
-#: g10/trustdb.c:589
+#: 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:604
+#: 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:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "Öffentlicher Schlüssel %08lX nicht gefunden: %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "Bitte ein --check-trustdb durchführen\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird überprüft\n"
 
 # translated by wk
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, 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:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "kein uneingeschränkt vertrauenswürdiger Schlüssel %08lX gefunden\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, 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:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marignal-needed, %d complete-needed, %s Trust-Modell\n"
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6235,6 +6004,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "quit"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
@@ -6275,6 +6048,157 @@
 msgstr ""
 "(möglicherweise haben Sie das falsche Programm für diese Aufgabe benutzt)\n"
 
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "list"
+#~ msgstr "Liste der Schlüssel"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsign"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fpr"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "Allgemeiner Fehler"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "save"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "key"
+
+#~ msgid "check"
+#~ msgstr "check"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "tsign"
+#~ msgstr "tsign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "addkey"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "primary"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "Schlüsselserverfehler"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "Hashmethode `%s' ist in diesem Release read-only\n"
 
Index: gnupg/po/el.po
diff -u gnupg/po/el.po:1.14 gnupg/po/el.po:1.15
--- gnupg/po/el.po:1.14	Fri Dec 10 23:20:54 2004
+++ gnupg/po/el.po	Tue Dec 14 08:49:27 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <madf at hellug.gr>\n"
 "Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -30,7 +30,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -354,7 +354,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -565,165 +565,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "ðáñáëåßöèçêå: ìõóôéêü êëåéäß Þäç ðáñþí\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "ôåñìáôéóìüò"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "ôåñìáôéóìüò áõôïý ôïõ ìåíïý"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "q"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "óõãêñïõüìåíåò åíôïëÝò\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "help"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "áðåéêüíéóç áõôÞò ôçò âïÞèåéáò"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "list"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Êëåéäß äéáèÝóéìï óôï: "
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "debug"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "enable"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsign"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "áëëáãÞ ôçò çìåñïìçíßáò ëÞîçò"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "áëëáãÞ ôçò åìðéóôïóýíçò éäéïêôÞôç"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "áðåéêüíéóç ôïõ fingerprint"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "ãåíéêü óöÜëìá"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "äçìéïõñãßá åíüò íÝïõ æåýãïõò êëåéäéþí"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "ÅíôïëÞ> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "óõãêñïõüìåíåò åíôïëÝò\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "óõãêñïõüìåíåò åíôïëÝò\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ìç Ýãêõñç åíôïëÞ  (äïêéìÜóôå \"help\")\n"
 
@@ -768,7 +691,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "ç öñÜóç êëåéäß äåí åðáíáëÞöèçêå óùóôÜ. ÄïêéìÜóôå îáíÜ"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -778,13 +701,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output äåí ëåéôïõñãåß ãéá áõôÞ ôçí åíôïëÞ\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1250,7 +1173,7 @@
 msgid "Pubkey: "
 msgstr "ÄçìïóÊëåéäß:"
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "Êñõðôáëãüñéèìïò: "
 
@@ -1258,7 +1181,7 @@
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Óõìðßåóç: "
 
@@ -1365,7 +1288,7 @@
 msgid "reading options from `%s'\n"
 msgstr "áíÜãíùóç åðéëïãþí áðü `%s'\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ÓÇÌÅÉÙÓÇ: ôï %s äåí åßíáé ãéá êáíïíéêÞ ÷ñÞóç!\n"
@@ -1377,343 +1300,343 @@
 "ç åðÝêôáóç ôïõ êñõðôáëãüñéèìïõ \"%s\" äåí öïñôþèçêå åðåéäÞ õðÜñ÷ïõí\n"
 "áíáóöáëåßò Üäåéåò\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "ôï %s äåí åßíáé Ýãêõñï óåô ÷áñáêôÞñùí\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "áäõíáìßá åðåîåñãáóßáò ôïõ URI ôïõ äéáêïìéóç êëåéäéþí\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "áäõíáìßá ïñéóìïý ôïõ exec-path óå %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï ðñüãñáììá ßóùò äçìéïõñãÞóåé áñ÷åßï core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï %s ðáñáêÜìðôåé ôï %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "ôï %s äåí åðéôñÝðåôáé ìå ôï %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "ôï %s äåí Ý÷åé êáììßá Ýííïéá ìáæß ìå ôï %s!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "ìðïñåßôå íá êÜíåôå áðïêïììÝíåò Þ êáèáñÝò õðïãñáöÝò ìüíï óå --pgp2 êáôÜóôáóç\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2614
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "äåí ìðïñåßôå íá õðïãñÜöåôå êáé íá êñõðôïãñáöåßôå ôáõôü÷ñïíá óå --pgp2 "
 "êáôÜóôáóç\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2620
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "ìüíï áñ÷åßá åðéôñÝðïíôáé (êáé ü÷é pipes) êáôá ôçí êáôáóôáóç --pgp2.\n"
 
-#: g10/g10.c:2635
+#: g10/g10.c:2633
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "ç êñõðôïãñÜöçóç åíüò ìçíýìáôïò óå --pgp2 êáôÜóôáóç áðáéôåß ôïí áëãïñ. IDEA\n"
 
-#: g10/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "ï åðéëåãìÝíïò áëãüñéèìïò êñõðôïãñÜöçóçò äåí åßíáé Ýãêõñïò\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "ï åðéëåãìÝíïò áëãüñéèìïò ðåñßëçøçò äåí åßíáé Ýãêõñïò\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "ï åðéëåãìÝíïò áëãüñéèìïò êñõðôïãñÜöçóçò äåí åßíáé Ýãêõñïò\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "ï åðéëåãìÝíïò áëãüñéèìïò ðåñßëçøçò ãéá ðéóôïðïßçóç\n"
 "äåí åßíáé Ýãêõñïò\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ðñÝðåé íá åßíáé ìåãáëýôåñá áðü 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ðñÝðåé íá åßíáé ìåãáëýôåñá áðü 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ðñÝðåé íá åßíáé ìåôáîý 1 êáé 255\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2742
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ìç Ýãêõñï default-cert-level· ðñÝðåé íá åßíáé 0, 1, 2, Þ 3\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2744
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ìç Ýãêõñï min-cert-level· ðñÝðåé íá åßíáé 0, 1, 2, Þ 3\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ÓÇÌÅÉÙÓÇ: ç áðëÞ S2K êáôÜóôáóç (0) ðñÝðåé íá áðïöåýãåôáé\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ìç Ýãêõñç êáôÜóôáóç S2K; ðñÝðåé íá åßíáé 0, 1 Þ 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý êñõðôáëãüñéèìïõ\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý áëãüñéèìïõ ðåñßëçøçò\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý áëãüñéèìïõ óõìðßåóçò\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "ôï %s áêüìá äå ëåéôïõñãåß ìáæß ìå ôï %s\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ êñõðôáëãüñéèìïõ \"%s\" óôçí êáôÜóôáóç %s\n"
 
-#: g10/g10.c:2862
+#: g10/g10.c:2860
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "áðáãïñåýåôå ç ÷ñÞóç ôïõ áëãüñéèìïõ ðåñßëçøçò \"%s\" óôçí êáôÜóôáóç %s\n"
 
-#: g10/g10.c:2867
+#: g10/g10.c:2865
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "áðáãïñåýåôå ç ÷ñÞóç ôïõ áëãüñéèìïõ óõìðßåóçò \"%s\" óôçí êáôÜóôáóç %s\n"
 
-#: g10/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "áðïôõ÷ßá áñ÷éêïðïßçóçò ôçò TrustDB: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äþèçêáí ðáñáëÞðôåò (-r) ÷þñéò ÷ñÞóç êñõðôïãñÜöçóçò\n"
 "äçìïóßïõ êëåéäéïý\n"
 
-#: g10/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "áðïêñõðôïãñÜöçóç áðÝôõ÷å: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ %s óôçí êáôÜóôáóç %s.\n"
 
-#: g10/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ %s óôçí êáôÜóôáóç %s.\n"
 
-#: g10/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [åíôïëÝò]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [êëåéäïèÞêç]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver áðïóôïëÞ áðÝôõ÷å: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ëÞøç áðÝôõ÷å: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "åîáãùãÞ êëåéäéïý áðÝôõ÷å: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver áíáæÞôçóç áðÝôõ÷å: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver áíáíÝùóç áðÝôõ÷å: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "áðïèùñÜêéóç áðÝôõ÷å: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "èùñÜêéóç áðÝôõ÷å: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ìç Ýãêõñïò áëãüñéèìïò  hash `%s'\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[üíïìá áñ÷åßïõ]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Ìðïñåßôå ôþñá íá åéóáãÜãåôå ôï ìÞíõìá óáò ...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1721,23 +1644,23 @@
 "Ýíá üíïìá óçìåßùóçò ìðïñåß íá ðåñéÝ÷åé ìüíï åêôõðþóéìïõò ÷áñáêôÞñåò êáé êåíÜ "
 "êáé íá ëÞãåé ìå Ýíá '='\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "ôï üíïìá óçìåßùóçò ÷ñÞóôç ðñÝðåé íá ðåñéÝ÷åé ôï '@' ÷áñáêôÞñá\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "ç ôéìÞ óçìåßùóçò ðñÝðåé íá ìç ÷ñçóéìïðïéåß ÷áñáêôÞñåò control\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "ôï URL ðïëéôéêÞò ðéóôïðïéçôéêïý ðïõ äüèçêå äåí åßíáé Ýãêõñï\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "ôï URL ðïëéôéêÞò õðïãñáöÞò ðïõ äüèçêå äåí åßíáé Ýãêõñï\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "ôï URL ðïëéôéêÞò õðïãñáöÞò ðïõ äüèçêå äåí åßíáé Ýãêõñï\n"
@@ -2611,12 +2534,12 @@
 msgstr "Ôï user ID \"%s\" áíáêáëåßôå."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï õðïãñÜøåôå; (y/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  Áäõíáìßá õðïãñáöÞò.\n"
 
@@ -2821,7 +2744,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Óßãïõñá íá õðïãñáöåß; "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2872,18 +2795,10 @@
 msgstr "ìåôáêßíçóç õðïãñáöÞò êëåéäéïý óôç óùóôÞ èÝóç\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "save"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "áðïèÞêåõóç êáé Ýîïäïò"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "áðåéêüíéóç ôïõ fingerprint"
 
@@ -2892,505 +2807,358 @@
 msgstr "áðåéêüíéóç ôùí êëåéäéþí êáé ôùí user ID"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "åðéëïãÞ user ID N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "key"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "åðéëïãÞ äåõôåñåýïíôïò êëåéäéïý N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "check"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "áðåéêüíéóç õðïãñáöþí"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "õðïãñáöÞ ôïõ êëåéäéïý"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "sign"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "äçìéïõñãßá ìéáò ìç ðñïóáñôçìÝíçò õðïãñáöÞò"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "õðïãñáöÞ ôïõ êëåéäéïý ôïðéêÜ"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "õðïãñáöÞ ôïõ êëåéäéïý ìç-áíáêáëÝóéìá"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "õðïãñáöÞ ôïõ êëåéäéïý ôïðéêÜ êáé ìç-áíáêáëÝóéìá"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "ðñïóèÞêç åíüò user ID"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "ðñïóèÞêç åíüò photo ID"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "äéáãñáöÞ åíüò user ID"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "ðñïóèÞêç åíüò äåõôåñåýïíôïò êëåéäéïý"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "äéáãñáöÞ åíüò äåõôåñåýïíôïò êëåéäéïý"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "ðñïóèÞêç åíüò êëåéäéïý áíÜêëçóçò"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "äéáãñáöÞ õðïãñáöþí"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "áëëáãÞ ôçò çìåñïìçíßáò ëÞîçò"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "ðñùôåýùí"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "óçìåßùóç ôïõ user ID óáí ðñùôåýùí"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "áëëáãÞ ìåôáîý ôçò áðåéêüíéóçò ìõóôéêïý êáé äçìüóéïõ êëåéäéïý"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "áðåéêüíéóç ðñïåðéëïãþí (åéäéêÝò)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "áðåéêüíéóç åðéëïãþí (áíáëõôéêÜ)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "ïñéóìüò áðåéêüíéóçò åðéëïãþí"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "áíáùåùìÝíåò åðéëïãÝò"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "óöÜëìá äéáêïìéóôÞ êëåéäéþí"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "áäõíáìßá åðåîåñãáóßáò ôïõ URI ôïõ äéáêïìéóç êëåéäéþí\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "áëëáãÞ ôçò öñÜóçò êëåéäß"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "áëëáãÞ ôçò åìðéóôïóýíçò éäéïêôÞôç"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "áíÜêëçóç õðïãñáöþí"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "áíÜêëçóç åíüò user ID"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "áíÜêëçóç åíüò äåõôåñåýïíôïò êëåéäéïý"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "áðåíåñãïðïéåß Ýíá êëåéäß"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "åíåñãïðïéåß Ýíá êëåéäß"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "áðåéêüíéóç photo ID"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ìõóôéêïý ìðëïê êëåéäéïý `%s': %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Ôï ìõóôéêü êëåéäß åßíáé äéáèÝóéìï.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Áðáéôåßôáé ôï ìõóôéêü êëåéäß ãéá íá ãßíåé áõôü.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Ðáñáêáëþ ÷ñçóéìïðïéåßóôå ôçí åíôïëÞ \"toggle\" ðñþôá.\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "Ôï êëåéäß áíáêëÞèçêå."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Óßãïõñá íá õðïãñáöïýí üëá ôá user ID; "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "ÓõìâïõëÞ: ÅðéëÝîôå ôï user ID ãéá õðïãñáöÞ\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "ÁõôÞ ç åíôïëÞ áðáãïñåýåôå óå áõôÞ ôçí êáôÜóôáóç %s.\n"
 
-#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "ÐñÝðåé íá åðéëÝîåôå ôï ëéãüôåñï Ýíá user ID.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "Äåí ìðïñåßôå íá äéáãñÜøåôå ôï ôåëåõôáßï user ID!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Óßãïõñá èÝëåôå íá äéáãñáöïýí üëá ôá åðéëåãìÝíá user ID; "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Óßãïõñá èÝëåôå íá äéáãñáöåß áõôü ôï user ID; "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Óßãïõñá èÝëåôå íá äéáãñáöåß áõôü ôï user ID; "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "ÐñÝðåé íá åðéëÝîåôå ôïõëÜ÷éóôïí Ýíá êëåéäß.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "ÐñÝðåé íá åðéëÝîåôå ôïõëÜ÷éóôïí Ýíá êëåéäß.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Óßãïõñá èÝëåôå íá äéáãñáöïýí ôá åðéëåãìÝíá êëåéäéÜ; "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Óßãïõñá èÝëåôå íá äéáãñáöåß áõôü ôï êëåéäß; "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Óßãïõñá èÝëåôå íá áíáêëçèïýí üëá ôá åðéëåãìÝíá user ID; "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï user ID; "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Óßãïõñá èÝëåôå íá áíáêëçèïýí ôá åðéëåãìÝíá êëåéäéÜ; "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï êëåéäß; "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ïñéóìüò áðåéêüíéóçò åðéëïãþí"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Óßãïõñá èÝëåôå íá áíáíåùèïýí ïé ðñïåðéëïãÝò ãéá ôï åðéëåãìÝíï user ID; "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Óßãïõñá íá áíáíåùèïýí ïé ðñïåðéëïãÝò;"
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "ÁðïèÞêåõóç ôùí áëëáãþí; "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ôåñìáôéóìüò ÷ùñßò áðïèÞêåõóç; "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ç åíçìÝñùóç áðÝôõ÷å: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ç åíçìÝñùóç ìõóôéêïý áðÝôõ÷å: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr "Ôï êëåéäß äåí Üëëáîå ïðüôå äåí ÷ñåéÜæåôáé åíçìÝñùóç.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Ðåñßëçøç: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Äõíáôüôçôå: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Áõôü ôï êëåéäß ìðïñåß íá áíáêëçèåß áðü %s êëåéäß "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (åõáßóèçôï)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "áäõíáìßá äçìéïõñãßáò ôïõ %s: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[áíáêëçìÝíï]"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [ëÞãåé: %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [ëÞãåé: %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " åìðéóôïóýíç: %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " åìðéóôïóýíç: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Áõôü ôï êëåéäß Ý÷åé áðåíåñãïðïéçèåß"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Äåí õðÜñ÷ïõí ðñïåðéëïãÝò óå Ýíá user ID ôýðïõ PGP 2.x.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3398,19 +3166,19 @@
 "Ç åããõñüôçôá ôïõ áðåéêïíéæüìåíïõ êëåéäéïý äåí åßíáé áðáñáßôçôá óùóôÞ\n"
 "åêôüò êáé åÜí åðáíáêêéíÞóåôå ôï ðñüãñáììá.\n"
 
-#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "[áíáêëçìÝíï]"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3418,7 +3186,7 @@
 "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äåí Ý÷åé óçìåéùèåß ID ÷ñÞóôç óáí ðñùôåýùí.  ÁõôÞ ç åíôïëÞ\n"
 "              ìðïñåß íá êÜíåé Ýíá Üëëï ID ÷ñÞóôç íá ãßíåé ôï ðñùôåýùí.\n"
 
-#: g10/keyedit.c:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3427,45 +3195,45 @@
 "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü Ýéíáé Ýíá êëåéäß ôýðïõ PGP2. Ç ðñïóèÞêç åíüò photo ID\n"
 "               ìðïñåß íá êÜíåé ìåñéêÝò åêäüóåéò PGP íá ôï áðïññßøïõí.\n"
 
-#: g10/keyedit.c:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Óßãïõñá áêüìá èÝëåôå íá ôï ðñïóèÝóåôå; (y/N) "
 
-#: g10/keyedit.c:2607
+#: g10/keyedit.c:2608
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Äåí ìðïñåßôå íá ðñïóèÝóåôå ìéá photo ID óå Ýíá êëåéäß ôýðïõ PGP2.\n"
 
-#: g10/keyedit.c:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "ÄéáãñáöÞ áõôÞò ôçò êáëÞò õðïãñáöÞò; (y/N/q)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "ÄéáãñáöÞ áõôÞò ôçò ìç Ýãêõñçò õðïãñáöÞò; (y/N/q)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "ÄéáãñáöÞ áõôÞò ôçò Üãíùóôçò õðïãñáöÞò; (y/N/q)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Óßãïõñá íá äéáãñáöåß áõôÞ ç éäéï-õðïãñáöÞ; (y/N)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "ÄéáãñÜöôçêå %d õðïãñáöÞ.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "ÄéáãñÜöçêáí %d õðïãñáöÝò.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Ôßðïôá äåí äéáãñÜöôçêå.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3475,38 +3243,38 @@
 "               êáèïñéóìÝíïõ áíáêëçôÞ ìðïñåß íá êÜíåé ìåñéêÝò åêäüóåéò PGP\n"
 "               íá ôï áðïññßøïõí.\n"
 
-#: g10/keyedit.c:2885
+#: g10/keyedit.c:2886
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Äåí ìðïñåßôå íá ðñïóèÝóåôå Ýíá êáèïñéóìÝíï áíáêëçôÞ óå êëåéäß ôýðïõ PGP2.x.\n"
 
-#: g10/keyedit.c:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "ÐëçêôñïëïãÞóôå ôï user ID ôïõ äéïñéóìÝíïõ áíáêëçôÞ: "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "áäõíáìßá ïñéóìïý åíüò êëåéäéïý ôýðïõ PGP 2.x, óáí äéïñéóìÝíïõ áíáêëçôÞ\n"
 
-#: g10/keyedit.c:2943
+#: g10/keyedit.c:2944
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "äå ìðïñåßôå íá ïñßóåôå Ýíá êëåéäß óáí ôï äéïñéóìÝíï áíáêëçôÞ ôïõ åáõôïý ôïõ\n"
 
-#: g10/keyedit.c:2965
+#: g10/keyedit.c:2966
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü ôï êëåéäß Ý÷åé áíáêëçèåß áðü ôïí ïñéóìÝíï áíáêëçôÞ!\n"
 
-#: g10/keyedit.c:2984
+#: g10/keyedit.c:2985
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: åÜí ïñßóåôå Ýíá êëåéäß óáí äéïñéóìÝíï áíáêëçôÞ äåí ìðïñåß íá "
 "åðáíÝëèåé!\n"
 
-#: g10/keyedit.c:2990
+#: g10/keyedit.c:2991
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3514,129 +3282,129 @@
 "Åßóôå óßãïõñïé üôé èÝëåôå íá ïñßóåôå Ýíá êëåéäß óáí äéïñéóìÝíï áíáêëçôÞ; (y/"
 "N): "
 
-#: g10/keyedit.c:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Ðáñáêáëþ áöáéñÝóôå ôéò åðéëïãÝò áðü ôá ìõóôéêÜ êëåéäéÜ.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Ðáñáêáëþ åðéëÝîôå ôï ðïëý Ýíá äåõôåñåýïí êëåéäß.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "ÁëëáãÞ çìåñïìçíßáò ëÞîçò ãéá Ýíá äåõôåñåýïí êëåéäß.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "ÁëëáãÞ çìåñïìçíßáò ëÞîçò ãéá Ýíá ðñùôåýïí êëåéäß.\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Äåí ìðïñåßôå íá áëëÜîåôå ôçí çìåñïìçíßá ëÞîçò óå Ýíá v3 êëåéäß\n"
 
-#: g10/keyedit.c:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "Äåí âñÝèçêå áíôßóôïé÷ç õðïãñáöÞ óôç ìõóôéêÞ êëåéäïèÞêç\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "ÐñÝðåé íá åðéëÝîåôå áêñéâþò Ýíá user ID.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ðáñáëåßöèçêå ç v3 éäéï-õðïãñáöÞ óôï user id \"%s\"\n"
 
-#: g10/keyedit.c:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï ÷ñçóéìïðïéÞóåôå; (y/N) "
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3497
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï ÷ñçóéìïðïéÞóåôå; (y/N) "
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Äåí õðÜñ÷åé user ID ìå äåßêôç %d\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Äåí õðÜñ÷åé äåõôåñåýïí êëåéäß ìå äåßêôç %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   õðïãñÜöèçêå áðü %08lX óôéò %s%s%s\n"
 
-#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (ìç-åîáãþãéìï)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "ÁõôÞ ç õðïãñáöÞ Ýëçîå óôéò %s.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï êëåéäß; "
 
-#: g10/keyedit.c:3738
+#: g10/keyedit.c:3739
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò ãéá áõôÞ ôçí õðïãñáöÞ; (y/N)"
 
-#: g10/keyedit.c:3765
+#: g10/keyedit.c:3766
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "¸÷åôå õðïãñÜøåé áõôÜ ôá user ID:\n"
 
-#: g10/keyedit.c:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (ìç-åîáãþãéìï)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   áíáêëÞèçêå áðü %08lX óôéò %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Óêïðåýåôå íá áíáêáëÝóåôå áõôÝò ôéò õðïãñáöÝò:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Óßãïõñá íá äçìéïõñãçèïýí ôá ðéóôïðïéçôéêÜ áíÜêëçóçò; (y/N)"
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "êáíÝíá ìõóôéêü êëåéäß\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ôï user ID \"%s\" Ý÷åé Þäç áíáêëçèåß\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìéá õðïãñáöÞ user ID Ý÷åé çìåñïìçíßá %d äåýôåñá óôï ìÝëëïí\n"
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, 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"
@@ -3964,7 +3732,7 @@
 "×ñåéÜæåóôå ìéá ÖñÜóç êëåéäß ãéá íá ðñïóôáôåýóåôå ôï ìõóôéêü êëåéäß.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4231,7 +3999,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n"
@@ -4246,106 +4014,106 @@
 msgid "key not found on keyserver\n"
 msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n"
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "õðïãñÜöèçêå ìå ôï êëåéäß óáò %08lX óôéò %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "óöÜëìá äéáêïìéóôÞ êëåéäéþí"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "óöÜëìá äéáêïìéóôÞ êëåéäéþí"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "keyserver ëÞøç áðÝôõ÷å: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áäõíáìßá äéáãñáöÞò tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n"
@@ -4524,7 +4292,7 @@
 msgid "textmode"
 msgstr "êáôÜóôáóç-êåéìÝíïõ"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "Üãíùóôï"
 
@@ -4701,50 +4469,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "õðïðáêÝôï ôýðïõ %d Ý÷åé ïñéóìÝíï ôï êñéôéêü bit\n"
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "ï gpg-agent äåí åßíáé äéáèÝóéìïò óå áõôÞ ôç óõíåäñßá\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "áäõíáìßá ïñéóìïý ôïõ pid ôïõ ðåëÜôç óéá ôï agent\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "áäõíáìßá áíÜãíùóçò ôïõ FD áðü ôï äéáêïìéóôÞ ãéá ôïí agent\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "áäõíáìßá åããñáöÞò ôïõ FD áðü ôï äéáêïìéóôÞ ãéá ôïí agent\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "êáêïäéáôõðïìÝíç ìåôáâëçôÞ ðåñéâÜëëïíôïò GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "äåí õðïóôçñßæåôáé ç Ýêäïóç ðñùôïêüëëïõ %d ôïõ gpg-agent\n"
 
-#: g10/passphrase.c:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "áäõíáìßá óýíäåóçò óôï `%s': %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "ðñüâëçìá åðéêïéíùíßáò ìå ôï gpg-agent\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "ðñüâëçìá ìå ôïí agent - áðåíåñãïðïéÞóç ôçò ÷ñÞóçò ôïõ agent\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (êýñéï êëåéäß, ID %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4756,41 +4524,41 @@
 "\"%.*s\"\n"
 "%u-bit %s êëåéäß, ID %08lX, äçìéïõñãßá %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "ÅðáíáëÜâåôå ôç öñÜóç\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "ÐëçêôñïëïãÞóôå ôç öñÜóç êëåéäß\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "ç öñÜóç êëåéäß åßíáé ðïëý ìåãÜëç\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "ìç Ýãêõñç áðÜíôçóç áðü ôïí agent\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "áêõñþèçêå áðü ôï ÷ñÞóôç\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "ðñüâëçìá ìå ôïí agent: agent åðéóôñÝöåé 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "áäõíáìßá åñþôçóçò ôçò ëÝîçò êëåéäß óå êáôÜóôáóç äÝóìçò\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "ÐëçêôñïëïãÞóôå ôç öñÜóç êëåéäß: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4800,17 +4568,17 @@
 "×ñåéÜæåóôå ìéá öñÜóç êëåéäß ãéá íá îåêëåéäþóåôå ôï ìõóôéêü êëåéäß\n"
 "ãéá ôï ÷ñÞóôç: \""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s êëåéäß, ID %08lX, äçìéïõñãßá %s"
 
-#: g10/passphrase.c:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "ÅðáíáëÜâåôå ôç öñÜóç êëåéäß: "
 
@@ -5707,12 +5475,12 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "ç trustdb åßíáé öèáñìÝíç - ÷ñçóéìïðïéåßóôå ôï \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "áäõíáìßá ÷åéñéóìïý ãñáììþí êåéìÝíïõ ìåãáëýôåñåò áðü %d ÷áñáêôÞñåò\n"
 
-#: g10/textfilter.c:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "ãñáììÞ åéóüäïõ ìåãáëýôåñç áðü %d ÷áñáêôÞñåò\n"
@@ -5773,7 +5541,7 @@
 msgid "[ revoked]"
 msgstr "[áíáêëçìÝíï]"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[ëçãìÝíï]"
@@ -5783,102 +5551,102 @@
 msgid "[ unknown]"
 msgstr "Üãíùóôï"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "ðïôÝ     "
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "äåí õðÜñ÷åé áíÜãêç ãéá Ýëåã÷ï ôçò trustdb\n"
 
-#: g10/trustdb.c:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "åðüìåíïò Ýëåã÷ïò ôçò trustdb èá ãßíåé óôéò %s\n"
 
-#: g10/trustdb.c:589
+#: 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:604
+#: 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:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ôï äçìüóéï êëåéäß %08lX äåí âñÝèçêå: %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "ðáñáêáëþ êÜíôå Ýíá --check-trustdb\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "Ýëåã÷ïò ôçò trustdb\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d êëåéäéÜ åðåîåñãÜóôçêáí (%d ìåôñÞóåéò åããõñüôçôáò ðÝñáóáí)\n"
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "äå âñÝèçêáí áðüëõôá åìðéóôåýóéìá êëåéäéÜ\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "äå âñÝèçêå ôï äçìüóéï êëåéäß ôïõ áðüëõôá åìðéóôåýóéìïõ êëåéäéïý %08lX\n"
 
-#: g10/trustdb.c:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "åããñáöÞ trust %lu, ôýðïò %d: write áðÝôõ÷å: %s\n"
@@ -6150,6 +5918,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "ôåñìáôéóìüò"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
@@ -6187,6 +5959,158 @@
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(ßóùò ÷ñçóéìïðïéÞóáôå ëÜèïò ðñüãñáììá ãéá áõôÞ ôçí åñãáóßá)\n"
 
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "list"
+#~ msgstr "list"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsign"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fpr"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "ãåíéêü óöÜëìá"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "save"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "key"
+
+#~ msgid "check"
+#~ msgstr "check"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "sign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "addkey"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "ðñùôåýùí"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "óöÜëìá äéáêïìéóôÞ êëåéäéþí"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr ""
 #~ "ï áëãüñéèìïò ðåñßëçøçò `%s' åßíáé óå áõôÞ ôçí Ýêäïóç ãéá áíÜãíùóç ìüíï\n"
Index: gnupg/po/eo.po
diff -u gnupg/po/eo.po:1.17 gnupg/po/eo.po:1.18
--- gnupg/po/eo.po:1.17	Fri Dec 10 23:20:54 2004
+++ gnupg/po/eo.po	Tue Dec 14 08:49:27 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo at rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
@@ -30,7 +30,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -351,7 +351,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -562,165 +562,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "ignorita: sekreta þlosilo jam æeestas\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "fini"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "forlasi æi tiun menuon"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "f"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "helpo"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "montri æi tiun helpon"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "listo"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "spuri"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "en"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsub"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "þanøi la daton de eksvalidiøo"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "þanøi la posedantofidon"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fsp"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "øenerala eraro"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan þlosilparon"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "pasf"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan þlosilon al '%s'\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
@@ -768,7 +691,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "la pasfrazo ne estis øuste ripetita; provu denove"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -778,13 +701,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por æi tiu komando\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "þlosilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1235,7 +1158,7 @@
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr ""
 
@@ -1243,7 +1166,7 @@
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
@@ -1348,7 +1271,7 @@
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
@@ -1358,342 +1281,342 @@
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de þlosilservilo\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida þlosilaro"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida þlosilaro"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida þlosilaro"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 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/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "æifri mesaøon kun --pgp2 postulas la æifron IDEA\n"
 
-#: g10/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita æifrad-metodo ne validas\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita æifrad-metodo ne validas\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, 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/g10.c:2744
+#: g10/g10.c:2742
 #, 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/g10.c:2746
+#: g10/g10.c:2744
 #, 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/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-reøimo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-reøimo; devas esti 0, 1 aý 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, 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/g10.c:2862
+#: g10/g10.c:2860
 #, 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/g10.c:2867
+#: g10/g10.c:2865
 #, 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/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "malæifrado malsukcesis: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, 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/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, 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/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key uzantidentigilo"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key uzantidentigilo"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [þlosilaro]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de þlosiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de þlosiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesaøon ...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1702,24 +1625,24 @@
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn aý substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -2573,13 +2496,13 @@
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 #, 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -2796,7 +2719,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Æu vere subskribi? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2849,18 +2772,10 @@
 msgstr "movas þlosilsubskribon al la øusta loko\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "skribi"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fsp"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "montri fingrospuron"
 
@@ -2869,533 +2784,384 @@
 msgstr "listigi þlosilojn kaj uzantidentigilojn"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "þlosilo"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "elekti flankan þlosilon N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "kontroli"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "listigi subskribojn"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "k"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "subskribi"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "subskribi la þlosilon"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "subskribi"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "fari apartan subskribon"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsub"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "subskribi la þlosilon loke"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsub"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "subskribi la þlosilon nerevokeble"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsub"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "subskribi la þlosilon loke kaj nerevokeble"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "aluid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "alfoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "foruid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "forviþi uzantidentigilon"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "forfoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "al"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "aldoni flankan þlosilon"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "al"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "for"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "forviþi flankan þlosilon"
 
-#: g10/keyedit.c:1275
-#, fuzzy
-msgid "addrevoker"
-msgstr "revokita"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 #, fuzzy
 msgid "add a revocation key"
 msgstr "aldoni flankan þlosilon"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "forsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "forviþi subskribojn"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "eksval"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "þanøi la daton de eksvalidiøo"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "æefa"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "marku uzantidentigilon kiel æefan"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "alia"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "de sekreta aý publika listo iri al la alia"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "a"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "monpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "agpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "aktpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "aktualigitaj preferoj"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "þlosilservila eraro"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "ne povis analizi URI de þlosilservilo\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "þanøi la pasfrazon"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "fido"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "þanøi la posedantofidon"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:1290
-#, fuzzy
-msgid "revuid"
-msgstr "revsig"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 #, fuzzy
 msgid "revoke a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "rev"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "revoki flankan þlosilon"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "el"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "malþalti þlosilon"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "en"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "þalti þlosilon"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "monfoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "montri foto-identigilon"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eraro dum legado de sekreta þlosilbloko '%s': %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Sekreta þlosilo estas havebla.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan þlosilon por fari tion.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 #, fuzzy
 msgid "Key is revoked."
 msgstr "Þlosilo estas revokita.\n"
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Æu vere subskribi æiujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, 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:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almenaý unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forviþi la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Æu vere forigi æiujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Æu vere forigi æi tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Æu vere forigi æi tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vi devas elekti almenaý unu þlosilon.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almenaý unu þlosilon.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, 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:1640
+#: g10/keyedit.c:1641
 #, 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:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Æu vere forigi æiujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Æu vere forigi æi tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Æu vi vere volas revoki la elektitajn þlosilojn? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Æu vi vere volas revoki æi tiun þlosilon? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, 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:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Æu vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Æu skribi þanøojn? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Æu fini sen skribi þanøojn? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr "Þlosilo ne þanøita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, 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:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidiøos: %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidiøos: %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Æi tiu þlosilo estas malþaltita"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3404,46 +3170,46 @@
 "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:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 #, 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:2607
+#: g10/keyedit.c:2608
 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:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Æu forviþi æi tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Æu forviþi æi tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Æu forviþi æi tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Æu vere forviþi æi tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forviþis %d subskribon.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forviþis %d subskribojn.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forviþita.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -3453,164 +3219,164 @@
 "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:2885
+#: g10/keyedit.c:2886
 #, 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:2905
+#: g10/keyedit.c:2906
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la þlosilgrandon"
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2943
+#: g10/keyedit.c:2944
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2965
+#: g10/keyedit.c:2966
 #, 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:2984
+#: g10/keyedit.c:2985
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:2990
+#: g10/keyedit.c:2991
 #, 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:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn þlosilojn.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Bonvolu elekti maksimume unu flankan þlosilon.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Þanøas la daton de eksvalidiøo de flanka þlosilo.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 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:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta þlosilaro\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "þlosilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, 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:3496
+#: g10/keyedit.c:3497
 #, 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:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Mankas flanka þlosilo kun indekso %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, 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:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Æi tiu þlosilo eksvalidiøos je %s.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 #, 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:3738
+#: g10/keyedit.c:3739
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Æu krei revokatestilon por æi tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:3765
+#: g10/keyedit.c:3766
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi þlosilon nerevokeble"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Æu vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "mankas sekreta þlosilo\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3938,7 +3704,7 @@
 "Vi bezonas pasfrazon por protekti vian sekretan þlosilon.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4206,7 +3972,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "nevalida þlosilaro"
@@ -4221,106 +3987,106 @@
 msgid "key not found on keyserver\n"
 msgstr "þlosilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, 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:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, 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:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via þlosilo %08lX je %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, 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:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "seræas pri \"%s\" æe HKP-servilo %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nevalida þlosilaro"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu þlosilservilo konata (uzu la opcion --keyserver)\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "þlosilservila eraro"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "þlosilservila eraro"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida þlosilidentigilo\n"
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, 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:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n"
@@ -4501,7 +4267,7 @@
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
@@ -4675,50 +4441,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas þaltitan \"critical bit\"\n"
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ne estas disponata en æi tiu sesio\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "ne povas agordi kliento-PID por la agento\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "ne povas akiri lego-FD de servilo por la agento\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "ne povas akiri skribo-FD de servilo por la agento\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, 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:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konektiøi al '%s': %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "komunikproblemo kun gpg-agent\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problemo kun agento - malþaltas uzadon de agento\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (æefþlosilo %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4729,41 +4495,41 @@
 "\"%.*s\"\n"
 "%u-bita %s þlosilo, ID %08lX, kreita je %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Donu pasfrazon\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "nevalida respondo de agento\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "ne povas kontroli pasvorton en neinteraga reøimo\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Donu pasfrazon: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4773,17 +4539,17 @@
 "Vi bezonas pasfrazon por malþlosi la sekretan þlosilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bita %s-þlosilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
@@ -5657,12 +5423,12 @@
 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:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "enigata linio pli longa ol %d signojn\n"
@@ -5721,7 +5487,7 @@
 msgid "[ revoked]"
 msgstr "rev"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "eksval"
@@ -5731,101 +5497,101 @@
 msgid "[ unknown]"
 msgstr "nekonata versio"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
 
-#: g10/trustdb.c:589
+#: 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:604
+#: 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:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika þlosilo %08lX ne trovita: %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "publika þlosilo de absolute fidata þlosilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, 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:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@ -6098,6 +5864,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "fini"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "fF"
@@ -6136,6 +5906,160 @@
 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"
 
+#~ msgid "q"
+#~ msgstr "f"
+
+#~ msgid "help"
+#~ msgstr "helpo"
+
+#~ msgid "list"
+#~ msgstr "listo"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "spuri"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "en"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsub"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fsp"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "øenerala eraro"
+
+#~ msgid "passwd"
+#~ msgstr "pasf"
+
+#~ msgid "save"
+#~ msgstr "skribi"
+
+#~ msgid "fpr"
+#~ msgstr "fsp"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "þlosilo"
+
+#~ msgid "check"
+#~ msgstr "kontroli"
+
+#~ msgid "c"
+#~ msgstr "k"
+
+#~ msgid "sign"
+#~ msgstr "subskribi"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "subskribi"
+
+#~ msgid "lsign"
+#~ msgstr "lsub"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsub"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsub"
+
+#~ msgid "adduid"
+#~ msgstr "aluid"
+
+#~ msgid "addphoto"
+#~ msgstr "alfoto"
+
+#~ msgid "deluid"
+#~ msgstr "foruid"
+
+#~ msgid "delphoto"
+#~ msgstr "forfoto"
+
+#~ msgid "addkey"
+#~ msgstr "al"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "al"
+
+#~ msgid "delkey"
+#~ msgstr "for"
+
+#, fuzzy
+#~ msgid "addrevoker"
+#~ msgstr "revokita"
+
+#~ msgid "delsig"
+#~ msgstr "forsig"
+
+#~ msgid "expire"
+#~ msgstr "eksval"
+
+#~ msgid "primary"
+#~ msgstr "æefa"
+
+#~ msgid "toggle"
+#~ msgstr "alia"
+
+#~ msgid "t"
+#~ msgstr "a"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "monpref"
+
+#~ msgid "setpref"
+#~ msgstr "agpref"
+
+#~ msgid "updpref"
+#~ msgstr "aktpref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "þlosilservila eraro"
+
+#~ msgid "trust"
+#~ msgstr "fido"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "revuid"
+#~ msgstr "revsig"
+
+#~ msgid "revkey"
+#~ msgstr "rev"
+
+#~ msgid "disable"
+#~ msgstr "el"
+
+#~ msgid "enable"
+#~ msgstr "en"
+
+#~ msgid "showphoto"
+#~ msgstr "monfoto"
+
 #~ msgid ""
 #~ "About to generate a new %s keypair.\n"
 #~ "              minimum keysize is  768 bits\n"
Index: gnupg/po/es.po
diff -u gnupg/po/es.po:1.13 gnupg/po/es.po:1.14
--- gnupg/po/es.po:1.13	Fri Dec 10 23:20:53 2004
+++ gnupg/po/es.po	Tue Dec 14 08:49:27 2004
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2004-10-12 19:27+0200\n"
 "Last-Translator: Jaime Suárez <jsuarez at ono.com>\n"
 "Language-Team: Spanish <es at li.org>\n"
@@ -34,7 +34,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -364,7 +364,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -577,165 +577,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "omitido: clave secreta ya presente\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "salir|fin|acabar"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "sale de este menú"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "s"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "órdenes incompatibles\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "ayuda"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "lista"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Clave disponible en: "
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "depura"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "habcla"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "firmal"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia fecha de caducidad"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia valores de confianza"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "hdac"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revfir"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "Error general"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nuevo par de claves"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "contr"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "órdenes incompatibles\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "órdenes incompatibles\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inválida (pruebe \"help\")\n"
 
@@ -783,7 +706,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "frase contraseña repetida incorrectamente; inténtelo de nuevo"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -793,13 +716,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave '%s' no encontrada: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1270,7 +1193,7 @@
 msgid "Pubkey: "
 msgstr "Clave pública: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "Cifrado: "
 
@@ -1278,7 +1201,7 @@
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Compresión: "
 
@@ -1382,7 +1305,7 @@
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: ¡%s no es para uso normal!\n"
@@ -1392,325 +1315,325 @@
 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/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no es un juego de caracteres válido\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URI del servidor de claves\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones de exportación inválidas\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opciones de exportación inválidas\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importación inválidas\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "opciones de importación inválidas\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportación inválidas\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "opciones de exportación inválidas\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opciones de importación inválidas\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opciones de importación inválidas\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de exportación inválidas\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opciones de exportación inválidas\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCIÓN: ¡el programa podría volcar un fichero core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s no permitido con %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 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/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 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/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inválido\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inválido\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inválido\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificación por resumen elegido es inválido\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango 1-255\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2742
 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/g10.c:2746
+#: g10/g10.c:2744
 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/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inválidas\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inválidas\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inválidas\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresión inválidas\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s aún no funciona con %s\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, fuzzy, 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/g10.c:2862
+#: g10/g10.c:2860
 #, fuzzy, 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/g10.c:2867
+#: g10/g10.c:2865
 #, fuzzy, 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/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicialización de la base de datos de confianza fallida: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 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/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no puede usar %s en modo %s\n"
 
-#: g10/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no puede usar %s en modo %s\n"
 
-#: g10/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-usuario"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-usuario"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [órdenes]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "envío al servidor de claves fallido: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepción del servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportación de clave fallida: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "búsqueda del servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovación al servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminación de armadura fallida: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creación de armadura fallida: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribución inválido `%s'\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1718,11 +1641,11 @@
 # En español no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario déjalo siempre.
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1730,23 +1653,23 @@
 "un nombre de notación debe tener sólo caracteres imprimibles o espacios, y "
 "acabar con un '='\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nombre de notación de usuario debe contener el caracter '@'\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notación no debe usar ningún caracter de control\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de política de certificado inválida\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de política inválida\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL de política inválida\n"
@@ -2615,12 +2538,12 @@
 msgstr "ID de usuario \"%s\" revocado."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "¿Seguro que todavía quiere firmarlo? (s/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
@@ -2822,7 +2745,7 @@
 msgid "Really sign? (y/N) "
 msgstr "¿Firmar de verdad? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2875,18 +2798,10 @@
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "graba"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "graba y sale"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "hdac"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "muestra huella dactilar"
 
@@ -2895,505 +2810,358 @@
 msgstr "lista clave e identificadores de usuario"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "idu"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "clave"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "selecciona clave secundaria N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "comprueba"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "lista firmas"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "firma"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "firma la clave"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "firma"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "crea una firma separada"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "firmal"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "firma la clave localmente"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "firmanr"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "firma la clave irrevocablemente"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "firmanrl"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "firma la clave local e irrevocablemente"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "añaidu"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "añade un identificador de usuario"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "añadirfoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "añade un ID fotográfico"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "borridu"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "borra un identificador de usuario"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "borfoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "añacla"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "añade una clave secundaria"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "añacla"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "borrcla"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "borra una clave secundaria"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "añarevoc"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "añade una clave de revocación"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "borrfir"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "borra firmas"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expira"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "cambia fecha de caducidad"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primaria"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "marca ID de usuario como primario"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "cambia"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "cambia entre lista de claves secretas y públicas"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "muestra preferencias (experto)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "verpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "muestra preferencias (prolijo)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "estpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "establece preferencias"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "actpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "preferencias actualizadas"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "error del servidor de claves"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "no se puede interpretar la URI del servidor de claves\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "cambia la frase contraseña"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "conf"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revfir"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "revoca firmas"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revidu"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "revocar un identificador de usuario"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revcla"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "revoca una clave secundaria"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "descla"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "deshabilita una clave"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "habcla"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "habilita una clave"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "verfoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "mostrar ID fotográfico"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error leyendo bloque de clave secreta `%s': %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor use la orden \"cambia\" primero.\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "La clave está revocada."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "¿Firmar realmente todos los identificadores de usuario? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, 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:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "¡No puede borrar el último identificador de usuario!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "¿Borrar realmente todos los identificadores seleccionados? "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "¿Borrar realmente este identificador de usuario? "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "¿Borrar realmente este identificador de usuario? "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "¿De verdad quiere borrar las claves seleccionadas? "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "¿De verdad quiere borrar esta clave? "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "¿Revocar realmente todos los identificadores seleccionados? "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "¿Revocar realmente este identificador de usuario? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "¿De verdad quiere revocar las claves seleccionadas? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "¿De verdad quiere revocar esta clave? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "establece preferencias"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "¿Actualizar realmente las preferencias para todos los ID seleccionados? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "¿Actualizar realmente las preferencias? "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "¿Grabar cambios? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "¿Salir sin grabar? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualización fallida: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualización de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualización.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Características: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta clave puede ser revocada por la clave %s"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (confidencial)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no se puede crear %s: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Esta clave está deshabilitada"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 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:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3401,19 +3169,19 @@
 "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:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expira"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3421,7 +3189,7 @@
 "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:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3430,45 +3198,45 @@
 "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:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "¿Está seguro de querer añadirla? (s/N) "
 
-#: g10/keyedit.c:2607
+#: g10/keyedit.c:2608
 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:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta firma inválida? (s/N/q)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "No se borró nada\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3477,163 +3245,163 @@
 "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:2885
+#: g10/keyedit.c:2886
 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:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 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:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "ATENCIÓN: ¡Esta clave ha sido revocada por la persona designada\n"
 "como revocador!\n"
 
-#: g10/keyedit.c:2984
+#: g10/keyedit.c:2985
 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:2990
+#: g10/keyedit.c:2991
 #, fuzzy
 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:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como máximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "¿Seguro que quiere usarlo? (s/N) "
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3497
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "¿Seguro que quiere usarlo? (s/N) "
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, 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:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el índice %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   firmada por %08lX el %s%s%s\n"
 
-#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caducó el %s.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¿De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:3738
+#: g10/keyedit.c:3739
 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:3765
+#: g10/keyedit.c:3766
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/keyedit.c:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX el %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¿Crear los certificados de revocación realmente? (s/N) "
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, 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:4126
+#: g10/keyedit.c:4127
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3964,7 +3732,7 @@
 "Necesita una frase contraseña para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4227,7 +3995,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opciones de exportación inválidas\n"
@@ -4242,106 +4010,106 @@
 msgid "key not found on keyserver\n"
 msgstr "clave '%s' no encontrada: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando clave %08lX a %s\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando clave %08lX a %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "buscando \"%s\" en el servidor HKP %s\n"
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" en el servidor HKP %s\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" en el servidor HKP %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opciones de exportación inválidas\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no hay servidores de claves conocidos (use opción --keyserver)\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "error del servidor de claves"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "error del servidor de claves"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "recepción del servidor de claves fallida: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "'%s' no es un identificador de clave válido\n"
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: no se puede borrar fichero temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "solicitando clave %08lX a %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "solicitando clave %08lX a %s\n"
@@ -4519,7 +4287,7 @@
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "desconocido"
 
@@ -4694,50 +4462,50 @@
 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:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 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:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "no puedo establecer pid para el agente\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "no puedo conseguir el FD de lectura para el agente\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "no puedo conseguir el FD de escritura para el agente\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, 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:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicación con el agente gpg\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con el agente - inhabilitando el uso del agente\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr "(ID clave primaria %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4748,41 +4516,41 @@
 "del usuario: \"%.*s\"\n"
 "%u bits, clave %s, ID %08lX, creada el %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Repita frase contraseña\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Introduzca frase contraseña\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "frase contraseña demasiado larga\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "respuesta del agente inválida\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "imposible pedir contraseña en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Introduzca frase contraseña: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4792,17 +4560,17 @@
 "Necesita una frase contraseña para desbloquear la clave secreta\n"
 "del usuario: \""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s"
 
-#: g10/passphrase.c:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Repita frase contraseña: "
 
@@ -5687,12 +5455,12 @@
 "La base de datos de confianza está dañada. Por favor, ejecute\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "línea de longitud superior a %d caracteres\n"
@@ -5751,7 +5519,7 @@
 msgid "[ revoked]"
 msgstr "[revocada]"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada]"
@@ -5761,101 +5529,101 @@
 msgid "[ unknown]"
 msgstr "desconocido"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "nunca     "
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: 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:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, 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:589
+#: g10/trustdb.c:590
 #, fuzzy, 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"
 
-#: g10/trustdb.c:604
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "no es necesaria una comprobación de la base de datos de confianza\n"
 
-#: g10/trustdb.c:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "clave pública %08lX no encontrada: %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "por favor haga un --check-trustdb\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d claves procesadas (%d validaciones superadas)\n"
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "no se encuentran claves totalmente fiables\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "clave pública de la clave totalmente fiable %08lX no encontrada\n"
 
-#: g10/trustdb.c:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
@@ -6153,6 +5921,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "salir|fin|acabar"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "sS"
@@ -6190,6 +5962,158 @@
 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 "q"
+#~ msgstr "s"
+
+#~ msgid "help"
+#~ msgstr "ayuda"
+
+#~ msgid "list"
+#~ msgstr "lista"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "depura"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "habcla"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "firmal"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "hdac"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revfir"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "Error general"
+
+#~ msgid "passwd"
+#~ msgstr "contr"
+
+#~ msgid "save"
+#~ msgstr "graba"
+
+#~ msgid "fpr"
+#~ msgstr "hdac"
+
+#~ msgid "uid"
+#~ msgstr "idu"
+
+#~ msgid "key"
+#~ msgstr "clave"
+
+#~ msgid "check"
+#~ msgstr "comprueba"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "firma"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "firma"
+
+#~ msgid "lsign"
+#~ msgstr "firmal"
+
+#~ msgid "nrsign"
+#~ msgstr "firmanr"
+
+#~ msgid "nrlsign"
+#~ msgstr "firmanrl"
+
+#~ msgid "adduid"
+#~ msgstr "añaidu"
+
+#~ msgid "addphoto"
+#~ msgstr "añadirfoto"
+
+#~ msgid "deluid"
+#~ msgstr "borridu"
+
+#~ msgid "delphoto"
+#~ msgstr "borfoto"
+
+#~ msgid "addkey"
+#~ msgstr "añacla"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "añacla"
+
+#~ msgid "delkey"
+#~ msgstr "borrcla"
+
+#~ msgid "addrevoker"
+#~ msgstr "añarevoc"
+
+#~ msgid "delsig"
+#~ msgstr "borrfir"
+
+#~ msgid "expire"
+#~ msgstr "expira"
+
+#~ msgid "primary"
+#~ msgstr "primaria"
+
+#~ msgid "toggle"
+#~ msgstr "cambia"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "verpref"
+
+#~ msgid "setpref"
+#~ msgstr "estpref"
+
+#~ msgid "updpref"
+#~ msgstr "actpref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "error del servidor de claves"
+
+#~ msgid "trust"
+#~ msgstr "conf"
+
+#~ msgid "revsig"
+#~ msgstr "revfir"
+
+#~ msgid "revuid"
+#~ msgstr "revidu"
+
+#~ msgid "revkey"
+#~ msgstr "revcla"
+
+#~ msgid "disable"
+#~ msgstr "descla"
+
+#~ msgid "enable"
+#~ msgstr "habcla"
+
+#~ msgid "showphoto"
+#~ msgstr "verfoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "el algoritmo de resumen `%s' es de sólo lectura en esta versión\n"
 
Index: gnupg/po/et.po
diff -u gnupg/po/et.po:1.13 gnupg/po/et.po:1.14
--- gnupg/po/et.po:1.13	Fri Dec 10 23:20:53 2004
+++ gnupg/po/et.po	Tue Dec 14 08:49:27 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome at microlink.ee>\n"
 "Language-Team: Estonian <et at li.org>\n"
@@ -30,7 +30,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -351,7 +351,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -562,165 +562,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "välju"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "välju sellest menüüst"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "v"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised käsud\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "help"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "näita seda abiinfot"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "list"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Võtme leiate: "
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "debug"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "enable"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsign"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "muuda aegumise kuupäeva"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näita sõrmejälge"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "üldine viga"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Käsklus> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane käsklus (proovige \"help\")\n"
 
@@ -765,7 +688,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "parooli ei korratud õieti; proovige uuesti"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -775,13 +698,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "võti --output ei tööta selle käsuga\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: 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:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1239,7 +1162,7 @@
 msgid "Pubkey: "
 msgstr "Avalik võti: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "¦iffer: "
 
@@ -1247,7 +1170,7 @@
 msgid "Hash: "
 msgstr "Räsi: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Pakkimine: "
 
@@ -1351,7 +1274,7 @@
 msgid "reading options from `%s'\n"
 msgstr "loen võtmeid failist `%s'\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MÄRKUS: %s ei ole tavapäraseks kasutamiseks!\n"
@@ -1361,335 +1284,335 @@
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ebaturvaliste õiguste tõttu ei laetud ¨ifri laiendust \"%s\"\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi võtmed\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi võtmed\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path väärtuseks ei õnnestu seada %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s määrab üle %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos mõtet!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 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/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate krüpteerimine --pgp2 moodis nõuab IDEA ¨iffrit\n"
 
-#: g10/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud ¨ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud lühendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud ¨ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, 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/g10.c:2744
+#: g10/g10.c:2742
 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/g10.c:2746
+#: g10/g10.c:2744
 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/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MÄRKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 või 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku ¨ifri eelistused\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku lühendi eelistused\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei tööta veel koos %s-ga\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, 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/g10.c:2862
+#: g10/g10.c:2860
 #, 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/g10.c:2867
+#: g10/g10.c:2865
 #, 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/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 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/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key kasutaja-id"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key kasutaja-id"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [käsud]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [võtmehoidla]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "võtme eksport ebaõnnestus: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "võtmeserveri otsing ebaõnnestus: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine ebaõnnestus: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage nüüd oma teade ...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1697,23 +1620,23 @@
 "noteerimise nimes võivad olla ainult trükitavad sümbolid või tühikud\n"
 "ning lõpus peab olema '='\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' märki\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "noteerimise väärtus ei või sisaldada kontroll sümboleid\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -2570,12 +2493,12 @@
 msgstr "Kasutaja ID \"%s\" on tühistatud."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
@@ -2776,7 +2699,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan tõesti? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2829,18 +2752,10 @@
 msgstr "tõstan võtme allkirja õigesse kohta\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "save"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "salvesta ja välju"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "näita sõrmejälge"
 
@@ -2849,504 +2764,357 @@
 msgstr "näita võtit ja kasutaja IDd"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "key"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "vali sekundaarne võti N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "check"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "näita allkirju"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "allkirjasta võti"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "sign"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "loo eraldiseisev allkiri"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "allkirjasta võti lokaalselt"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "allkirjasta võti kehtetuks mitte-tunnistatavana"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "allkirjasta võti lokaalselt ja kehtetuks mitte-tunnistatavana"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "lisa foto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "kustuta kasutaja ID"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "lisa sekundaarne võti"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "kustuta sekundaarne võti"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "lisa tühistamise võti"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "kustuta allkirjad"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "muuda aegumise kuupäeva"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primaarne"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "märgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "lülita"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "lülita salajaste või avalike võtmete loendi vahel"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "näita eelistusi (ekspert)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "näita eelistusi (detailsena)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "uuendatud eelistused"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "võtmeserveri viga"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "tühista allkirjad"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "tühista kasutaja ID"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "tühista sekundaarne võti"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "blokeeri võti"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "luba võti"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "näita foto ID"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "viga salajase võtmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Salajane võti on kasutatav.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast võtit.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage kõigepealt käsku \"toggle\".\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "Võti on tühistatud."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, 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:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima vähemalt ühe kasutaja ID.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Kas kustutan tõesti kõik kasutaja IDd? "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Kas eemaldan tõesti selle kasutaja ID? "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Kas eemaldan tõesti selle kasutaja ID? "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Te peata valima vähemalt ühe võtme.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima vähemalt ühe võtme.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, 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:1640
+#: g10/keyedit.c:1641
 #, 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:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Kas tühistan tõesti kõik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Kas tühistan tõesti selle kasutaja ID? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Kas te tõesti soovite valitud võtmeid tühistada? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Kas te tõesti soovite seda võtit tühistada? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, 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:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Kas tõesti uuendan seaded? "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Väljun salvestamata? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Teatelühend: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, 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:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei õnnestu luua: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[tühistatud] "
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "See võti on blokeeritud"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 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:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3354,19 +3122,19 @@
 "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:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "[tühistatud] "
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3374,7 +3142,7 @@
 "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:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3383,45 +3151,45 @@
 "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:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 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:2607
+#: g10/keyedit.c:2608
 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:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3430,160 +3198,160 @@
 "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:2885
+#: g10/keyedit.c:2886
 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:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage määratud tühistaja kasutaja ID: "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 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:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 #, 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:2984
+#: g10/keyedit.c:2985
 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:2990
+#: g10/keyedit.c:2991
 #, 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:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt võtmetelt valikud.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "palun valige ülimalt üks sekundaarne võti.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Muudan sekundaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige täpselt üks kasutaja ID.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, 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:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3497
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Sekundaarne võti numbriga %d puudub\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 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:3738
+#: g10/keyedit.c:3739
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:3765
+#: g10/keyedit.c:3766
 #, 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:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   tühistanud %08lX %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute tühistama järgmisi allkirju:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "salajast võtit pole\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, 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:4126
+#: g10/keyedit.c:4127
 #, 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"
@@ -3910,7 +3678,7 @@
 "Te vajate oma salajase võtme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4169,7 +3937,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "vigased ekspordi võtmed\n"
@@ -4184,106 +3952,106 @@
 msgid "key not found on keyserver\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, 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:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "küsin võtit %08lX võtmeserverist %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allkirjastatud teie võtmega %08lX %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "võtmeserveri viga"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "võtmeserveri viga"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, 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:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "küsin võtit %08lX võtmeserverist %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "küsin võtit %08lX võtmeserverist %s\n"
@@ -4460,7 +4228,7 @@
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "tundmatu"
 
@@ -4634,50 +4402,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n"
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "agendile ei õnnestu seada kliendi pid\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "agendiga suhtlemiseks ei õnnestu saada lugemise FD\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "agendiga suhtlemiseks ei õnnestu saada kirjutamise FD\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, 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:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "probleem gpg-agent programmiga suhtlemisel\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probleem agendiga - blokeerin agendi kasutamise\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (peamise võtme ID %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4688,41 +4456,41 @@
 "\"%.*s\"\n"
 "%u-bitti %s võti, ID %08lX, loodud %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Korrake parooli\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Sisestage parool\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "liiga pikk parool\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "vigane vastus agendilt\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "pakettmoodis ei saa parooli küsida\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Sisestage parool: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4732,17 +4500,17 @@
 "Te vajate kasutaja salajase võtme lahtilukustamiseks\n"
 "parooli: \""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, 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:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Korrake parooli: "
 
@@ -5616,12 +5384,12 @@
 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:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "sisendrida on pikem, kui %d sümbolit\n"
@@ -5680,7 +5448,7 @@
 msgid "[ revoked]"
 msgstr "[tühistatud] "
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[aegunud] "
@@ -5690,101 +5458,101 @@
 msgid "[ unknown]"
 msgstr "tundmatu"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "mitte kunagi"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb järgmine kontroll %s\n"
 
-#: g10/trustdb.c:589
+#: 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:604
+#: 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:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ei leia avalikku võtit %08lX: %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "palun tehke --check-trustdb\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d võtit töödeldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "absoluutselt usaldatavaid võtmeid pole\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, 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:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, 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"
@@ -6056,6 +5824,10 @@
 msgid "nN"
 msgstr "eE"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "välju"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "vV"
@@ -6093,6 +5865,158 @@
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(te kasutasite vahest selle töö jaoks valet programmi)\n"
 
+#~ msgid "q"
+#~ msgstr "v"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "list"
+#~ msgstr "list"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsign"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fpr"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "üldine viga"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "save"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "key"
+
+#~ msgid "check"
+#~ msgstr "check"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "sign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "lisa foto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "addkey"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "primaarne"
+
+#~ msgid "toggle"
+#~ msgstr "lülita"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "võtmeserveri viga"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "sõnumilühendi algoritm `%s' ei ole selles versioonis muudetav\n"
 
Index: gnupg/po/fi.po
diff -u gnupg/po/fi.po:1.8 gnupg/po/fi.po:1.9
--- gnupg/po/fi.po:1.8	Fri Dec 10 23:20:53 2004
+++ gnupg/po/fi.po	Tue Dec 14 08:49:27 2004
@@ -22,7 +22,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen at iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@ -46,7 +46,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -371,7 +371,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -582,165 +582,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "lopeta|sulje"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "q"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "apua"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "list"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "debug"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "enable"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsign"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "yleinen virhe"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Komento> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
@@ -785,7 +708,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -795,13 +718,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: 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:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1260,7 +1183,7 @@
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "Salaus: "
 
@@ -1268,7 +1191,7 @@
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Pakkaus: "
 
@@ -1372,7 +1295,7 @@
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
@@ -1382,336 +1305,336 @@
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, 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/g10.c:2744
+#: g10/g10.c:2742
 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/g10.c:2746
+#: g10/g10.c:2744
 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/g10.c:2749
+#: g10/g10.c:2747
 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/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, 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/g10.c:2862
+#: g10/g10.c:2860
 #, 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/g10.c:2867
+#: g10/g10.c:2865
 #, 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/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 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/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, 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/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, 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/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrlsign-key käyttäjätunnus"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key käyttäjätunnus"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1719,23 +1642,23 @@
 "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
 "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -2606,12 +2529,12 @@
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  Allekirjoittaminen ei onnistu.\n"
 
@@ -2814,7 +2737,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2867,18 +2790,10 @@
 msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "tallenna"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "tallenna ja lopeta"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "näytä sormenjälki"
 
@@ -2887,504 +2802,357 @@
 msgstr "näytä avaimet ja käyttäjätunnukset"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "valitse käyttäjätunnus N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "key"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "valitse toissijainen avain N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "check"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "näytä allekirjoitukset"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "allekirjoita avain"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "sign"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "tee erillinen allekirjoitus"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "allekirjoita avain paikallisesti"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "allekirjoita avain mitätöimättömästi"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "allekirjoita avain paikallisesti ja mitätöimättömästi"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "lisää käyttäjätunnus"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "lisää valokuva"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "poista käyttäjätunnus"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "lisää toissijainen avain"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "poista toissijainen avain"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "lisää mitätöintiavain"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "poista allekirjoitus"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primary"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "merkitse käyttäjätunnus ensisijaiseksi"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "vaihda salaisten ja julkisten avainten luettelon välillä"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "näytä valinnat (asiantuntija)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "näytä valinnat (monisanaisesti)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "näytä valinnat"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "päivitä valinnat"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "avainpalvelinvirhe"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "muuta luottamusastetta"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "mitätöi allekirjoitus"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "mitätöi käyttäjätunnus"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "poista avain käytöstä"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "ota avain käyttöön"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "näytä valokuvatunniste"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Salainen avain on saatavilla.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Tähän tarvitaan salainen avain.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Käytä ensin komentoa \"toggle\".\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "Avain on mitätöity."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, 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:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 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:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Haluatko varmasti poistaa tämän avaimen? "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "näytä valinnat"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, 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:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Varmastiko päivitä valinnat? "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Tallenna muutokset? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, 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:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 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:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3392,19 +3160,19 @@
 "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:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3412,7 +3180,7 @@
 "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:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3421,45 +3189,45 @@
 "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:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:2607
+#: g10/keyedit.c:2608
 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:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3469,162 +3237,162 @@
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:2885
+#: g10/keyedit.c:2886
 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:2905
+#: g10/keyedit.c:2906
 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:2928
+#: g10/keyedit.c:2929
 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:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 #, 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:2984
+#: g10/keyedit.c:2985
 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:2990
+#: g10/keyedit.c:2991
 #, 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:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, 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:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3497
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Indeksillä %d ei löydy toissijaista avainta\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, 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:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:3738
+#: g10/keyedit.c:3739
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:3765
+#: g10/keyedit.c:3766
 #, 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:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, 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:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, 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:3957
+#: g10/keyedit.c:3958
 #, 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:4126
+#: g10/keyedit.c:4127
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3955,7 +3723,7 @@
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4219,7 +3987,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "virheelliset vientivalitsimet\n"
@@ -4234,106 +4002,106 @@
 msgid "key not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, 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:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
@@ -4514,7 +4282,7 @@
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "tuntematon "
 
@@ -4691,50 +4459,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 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:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "agentille ei voida asettaa pid:tä\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "palvelin ei lue agentin FD:tä\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "palvelin ei kirjoita agentille FD:tä\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 
-#: g10/passphrase.c:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agentin kanssa yhteysongelma\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "agentin käytössä on ongelmia - agenttia ei käytetä\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (pääavaimen tunnus %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4745,41 +4513,41 @@
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Toista salasana\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Syötä salasana\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "salasana on liian pitkä\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "agentin lähettämä vastaus ei kelpaa\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "salasanan kysyminen ei onnistu eräajossa\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Syötä salasana: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4788,17 +4556,17 @@
 "\n"
 "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
 
-#: g10/passphrase.c:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Toista salasana: "
 
@@ -5695,12 +5463,12 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb on turmeltunut; suorita \"gpg --fix-trustdb\"\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "syöterivi on yli %d merkkiä pitkä\n"
@@ -5760,7 +5528,7 @@
 msgid "[ revoked]"
 msgstr "[mitätöity] "
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[vanhentunut] "
@@ -5770,101 +5538,101 @@
 msgid "[ unknown]"
 msgstr "tuntematon "
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "ei koskaan"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "seuraava trustdb tarkistus %s\n"
 
-#: g10/trustdb.c:589
+#: 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:604
+#: 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:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "julkista avainta %08lX ei löydy: %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "tee --check-trustdb, kiitos\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "tarkistetaan trustdb:tä\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, 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:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@ -6136,6 +5904,10 @@
 msgid "nN"
 msgstr "eE"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "lopeta|sulje"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "lLsS"
@@ -6173,6 +5945,158 @@
 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 "q"
+#~ msgstr "q"
+
+#~ msgid "help"
+#~ msgstr "apua"
+
+#~ msgid "list"
+#~ msgstr "list"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsign"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fpr"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "yleinen virhe"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "tallenna"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "key"
+
+#~ msgid "check"
+#~ msgstr "check"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "sign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "addkey"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "primary"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "avainpalvelinvirhe"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr ""
 #~ "tiivistealgoritmia \"%s\" voidaan ainoastaan lukea tässä julkaisussa\n"
Index: gnupg/po/fr.po
diff -u gnupg/po/fr.po:1.67 gnupg/po/fr.po:1.68
--- gnupg/po/fr.po:1.67	Fri Dec 10 23:20:52 2004
+++ gnupg/po/fr.po	Tue Dec 14 08:49:27 2004
@@ -5,13 +5,13 @@
 # Thanks to Rémi Guyomarch <rguyom at mail.dotcom.fr> and <nmorant at amadeus.net>
 # for pointing me out some errors.
 #
-# $Id: fr.po,v 1.67 2004/12/10 22:20:52 wk Exp $
+# $Id: fr.po,v 1.68 2004/12/14 07:49:27 wk Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.93-cvs\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2004-11-08 01:13+0100\n"
 "Last-Translator: Gaël Quéri <gael at lautre.net>\n"
 "Language-Team: French <traduc at traduc.org>\n"
@@ -35,7 +35,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -364,7 +364,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr "carte OpenPGP n° %s détectée\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
@@ -562,154 +562,81 @@
 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:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "quitter"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "q"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr "admin"
-
 #: g10/card-util.c:1252
 msgid "show admin commands"
 msgstr "indiquer les commandes d'administration"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "help"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "afficher cette aide"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "lister"
-
 #: g10/card-util.c:1255
 msgid "list all available data"
 msgstr "lister toutes les données disponibles"
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "déboguer"
-
-#: g10/card-util.c:1258
-msgid "name"
-msgstr "nom"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr "changer le nom du propriétaire de la carte"
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr "url"
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr "changer l'URL pour récupérer la clé"
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr "chercher"
-
-#: g10/card-util.c:1261
 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:1262
-msgid "login"
-msgstr "identification"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 msgid "change the login name"
 msgstr "changer le nom d'identification"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr "langue"
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 msgid "change the language preferences"
 msgstr "changer les préférences de langue"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr "sexe"
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr "changer le sexe du propriétaire de la carte"
 
-# g10/keyedit.c:556 ???
-#: g10/card-util.c:1265
-msgid "cafpr"
-msgstr "emprac"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 msgid "change a CA fingerprint"
 msgstr "changer l'empreinte d'une autorité de certification"
 
-#: g10/card-util.c:1266
-msgid "forcesig"
-msgstr "forcersig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 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:1268
-msgid "generate"
-msgstr "générer"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 msgid "generate new keys"
 msgstr "générer de nouvelles clés"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "mot.pas"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr "menu pour changer ou déverrouiller le PIN"
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 msgid "Admin-only command\n"
 msgstr "La commande n'est utilisable qu'en mode administration\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 msgid "Admin commands are allowed\n"
 msgstr "Les commandes d'administration sont permises\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez «help»)\n"
 
@@ -759,7 +686,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "le mot de passe n'a pas été correctement répété ; recommencez."
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -769,13 +696,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clé « %s » introuvable: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1244,7 +1171,7 @@
 msgid "Pubkey: "
 msgstr "Clé publique: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
@@ -1252,7 +1179,7 @@
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Compression: "
 
@@ -1380,7 +1307,7 @@
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
@@ -1392,342 +1319,342 @@
 "l'extension de chiffrement `%s' n'a pas été chargée car ses\n"
 "permissions sont peu sûres\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' n'est pas un jeu de caractères valide\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpréter l'URL du serveur de clés\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: les options du serveur de clés sont invalides\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de clés sont invalides\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de vérification invalides\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 msgid "invalid verify options\n"
 msgstr "options de vérification invalides\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de mettre le chemin d'exécution à %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut créer un fichier «core» !\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 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/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 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/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement sélectionné est invalide\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage sélectionnée est invalide\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression sélectionné est invalide\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification sélectionnée est invalide\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "«completes-needed» doit être supérieur à 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "«marginals-needed» doit être supérieur à 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 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/g10.c:2744
+#: g10/g10.c:2742
 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/g10.c:2746
+#: g10/g10.c:2744
 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/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement déconseillé\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit être 0, 1 ou 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "préférences par défaut invalides\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "préférences de chiffrement personnelles invalides\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "préférences de hachage personnelles invalides\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "préférences de compression personnelles invalides\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, 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/g10.c:2862
+#: g10/g10.c:2860
 #, 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/g10.c:2867
+#: g10/g10.c:2865
 #, 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/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 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/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement symétrique de `%s' a échoué: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 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/g10.c:3022
+#: g10/g10.c:3020
 #, 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/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 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/g10.c:3073
+#: g10/g10.c:3071
 #, 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/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key utilisateur"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key utilisateur"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-clés]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de clés a échoué: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la réception depuis le serveur de clés a échoué: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la clé a échoué: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "la recherche au sein du serveur de clés a échoué: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "le rafraîchissement par le serveur de clés a échoué: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a échoué: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a échoué: %s \n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1735,23 +1662,23 @@
 "le nom d'une notation ne doit comporter que des caractères imprimables\n"
 "ou des espaces, et se terminer par un signe '='\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notation utilisateur doit contenir le caractère '@'\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caractère de contrôle\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donnée est invalide\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donnée est invalide\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 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"
 
@@ -2636,12 +2563,12 @@
 msgstr "Le nom d'utilisateur \"%s\" est révoqué."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  Impossible de signer.\n"
 
@@ -2824,7 +2751,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Signer réellement ? (o/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2875,18 +2802,9 @@
 msgstr "replacer la signature d'une clé à l'endroit correct\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "enregistrer"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-# g10/keyedit.c:556 ???
-#: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
 #: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "afficher l'empreinte"
@@ -2896,488 +2814,344 @@
 msgstr "lister la clé et les noms d'utilisateurs"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "sélectionner le nom d'utilisateur N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "clé"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "sélectionner la clé secondaire N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "vérifier"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "lister les signatures"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "signer"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "signer la clé"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-msgid "tsign"
-msgstr "tsigner"
-
 #: g10/keyedit.c:1259
 msgid "make a trust signature"
 msgstr "faire une signature de confiance"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsigner"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "signer la clé localement"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsigner"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "signer la clé de façon non-révocable"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsigner"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "signer la clé de façon locale et non-révocable"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "aj.ut"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "aj.photo"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identité"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "suppr.ut"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "enlever un utilisateur"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "suppr.photo"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "aj.clé"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "ajouter une clé secondaire"
 
-#: g10/keyedit.c:1271
-msgid "addcardkey"
-msgstr "ajclécarte"
-
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1272
 msgid "add a key to a smartcard"
 msgstr "ajouter une clé à une carte à puce"
 
-#: g10/keyedit.c:1272
-msgid "keytocard"
-msgstr "cléverscarte"
-
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr "déplacer une clé vers une carte à puce"
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "suppr.clé"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "enlever une clé secondaire"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "aj.rev"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "ajouter une clé de révocation"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "suppr.sign"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "supprimer les signatures"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "changer la date d'expiration"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "principale"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "marquer le nom d'utilisateur comme principal"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "changer"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "passer de la liste des clés secrètes aux clés privées et inversement"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "préf"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "lister les préférences (expert)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "montr.préf"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "lister les préférences (bavard)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "mettre.préf"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "donner la liste de préférences"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "préf.màj"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "préférences mises à jour"
 
-#: g10/keyedit.c:1286
-msgid "keyserver"
-msgstr "servclés"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 msgid "set preferred keyserver URL"
 msgstr "indiquer l'URL du serveur de clés préféré"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "changer le mot de passe"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "confi."
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "révoquer les signatures"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "révoquer un nom d'utilisateur"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revclé"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "révoquer une clé secondaire"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "désactiver"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "désactiver une clé"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "activer"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "activer une clé"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "montr.photo"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "montrer la photo d'identité"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, 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:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "La clé secrète est disponible.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la clé secrète pour faire cela.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande «toggle» d'abord.\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "La clé est révoquée."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Signer vraiment tous les nom d'utilisateurs ? (o/N) "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: Sélectionner les utilisateurs à signer\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, 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:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez sélectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 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:1554
+#: g10/keyedit.c:1555
 msgid "Really remove this user ID? (y/N) "
 msgstr "Enlever réellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 msgid "Really move the primary key? (y/N) "
 msgstr "Enlever réellement la clé principale ? (o/N) "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 msgid "You must select exactly one key.\n"
 msgstr "Vous devez sélectionner exactement une clé.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Vous devez sélectionner au moins une clé.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 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:1640
+#: g10/keyedit.c:1641
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voulez-vous vraiment supprimer cette clé ? (o/N) "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 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:1676
+#: g10/keyedit.c:1677
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Révoquer réellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Voulez-vous vraiment révoquer les clés sélectionnées ? (o/N) "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Voulez-vous vraiment révoquer cette clé ? (o/N) "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 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:1767
+#: g10/keyedit.c:1768
 msgid "Set preference list to:\n"
 msgstr "Changer la liste de préférences en :\n"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 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:1775
+#: g10/keyedit.c:1776
 msgid "Really update the preferences? (y/N) "
 msgstr "Faut-il vraiment mettre à jour les préférences ? (o/N) "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 msgid "Save changes? (y/N) "
 msgstr "Enregistrer les changements? (o/N) "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 msgid "Quit without saving? (y/N) "
 msgstr "Quitter sans enregistrer ? (o/N) "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise à jour a échoué: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise à jour de la clé secrète a échoué: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 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:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Hachage: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Fonctions: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr "Serveur de clés: pas-de-modification"
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr "Serveur de clés préféré: "
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, 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:2251
+#: g10/keyedit.c:2252
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, c-format
 msgid "created: %s"
 msgstr "créé: %s"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, c-format
 msgid "revoked: %s"
 msgstr "revoqué: %s"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, c-format
 msgid "expired: %s"
 msgstr "expiré: %s"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, c-format
 msgid "expires: %s"
 msgstr "expire: %s"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation: %s"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, c-format
 msgid "trust: %s"
 msgstr " confiance: %s"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr "validité: %s"
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Cette clé a été désactivée"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr "n° de carte: "
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 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:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3385,17 +3159,17 @@
 "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:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 msgid "revoked"
 msgstr "revoquée"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 msgid "expired"
 msgstr "expirée"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3404,7 +3178,7 @@
 "Cette commande risque de rendre un autre nom d'utilisateur principal\n"
 "par défaut.\n"
 
-#: g10/keyedit.c:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3414,46 +3188,46 @@
 "d'identité peut empêcher certaines versions de PGP d'accepter\n"
 "cette clé\n"
 
-#: g10/keyedit.c:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 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:2607
+#: g10/keyedit.c:2608
 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:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprimée.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprimées\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a été supprimé.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3463,165 +3237,165 @@
 "désigné peut empêcher certaines versions de PGP d'accepter\n"
 "cette clé.\n"
 
-#: g10/keyedit.c:2885
+#: g10/keyedit.c:2886
 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:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez le nom d'utilisateur du révocateur désigné: "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 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:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 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:2984
+#: g10/keyedit.c:2985
 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:2990
+#: g10/keyedit.c:2991
 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:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les sélections des clés secrètes.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez sélectionner au plus une clé secondaire.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une clé secondaire.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la clé principale.\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-clés secret\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez sélectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, 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:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de clés favori: "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 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:3496
+#: g10/keyedit.c:3497
 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:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de clé secondaire avec l'index %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "nom d'utilisateur: « %s »\n"
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, 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:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expiré le %s.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 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:3738
+#: g10/keyedit.c:3739
 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:3765
+#: g10/keyedit.c:3766
 #, 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:3791
+#: g10/keyedit.c:3792
 msgid " (non-revocable)"
 msgstr " (non-révocable)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "révoqué par votre clé %s à %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous êtes sur le point de révoquer ces signatures:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Créer réellement les certificats de révocation ? (o/N) "
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "pas de clé secrète\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, 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:3957
+#: g10/keyedit.c:3958
 #, 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:4126
+#: g10/keyedit.c:4127
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3948,7 +3722,7 @@
 "Vous avez besoin d'un mot de passe pour protéger votre clé secrète.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4215,7 +3989,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > "
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocole serveur de clés invalide (nous %d!=gestionnaire %d)\n"
@@ -4229,109 +4003,109 @@
 msgid "key not found on keyserver\n"
 msgstr "clé non trouvée dans le serveur de clés\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, 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:900
+#: g10/keyserver.c:905
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requête de la clé %s de %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, 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:1049
+#: g10/keyserver.c:1054
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "envoi de la clé %s à %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "recherche de « %s » du serveur %s %s\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "recherche de « %s » de %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 msgid "no keyserver action!\n"
 msgstr "pas d'action pour le serveur de clés !\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, 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:1159
+#: g10/keyserver.c:1164
 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:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "pas de serveur de clés connu (utilisez l'option --keyserver)\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 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:1236
+#: g10/keyserver.c:1241
 #, 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:1241
+#: g10/keyserver.c:1246
 #, 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:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr "gpgkeys_%s ne supporte pas le gestionnaire de version %d\n"
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 msgid "keyserver timed out\n"
 msgstr "le délai d'attente du serveur de clés a expiré\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 msgid "keyserver internal error\n"
 msgstr "erreur interne du serveur de clés\n"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "erreur de communication avec le serveur de clés: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "« %s » n'est pas une ID de clé: ignoré\n"
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, 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:1600
+#: g10/keyserver.c:1607
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "rafraîchissement d'une clé depuis %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "rafraîchissement de %d clés depuis %s\n"
@@ -4510,7 +4284,7 @@
 msgid "textmode"
 msgstr "modetexte"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "inconnu"
 
@@ -4688,53 +4462,53 @@
 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:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "impossible d'obtenir le pid du client pour l'agent\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 "impossible d'obtenir le descripteur de lecture du serveur\n"
 "pour l'agent\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 "impossible d'obtenir le descripteur d'écriture du serveur pour l'agent\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'environnement GPG_AGENT_INFO est mal définie\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, 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:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter à `%s': %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "problème de communication avec ssh-agent\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 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:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID clé principale %s)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4746,40 +4520,40 @@
 "\"%.*s\"\n"
 "clé %u bits %s, ID %s, créée %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Répétez le mot de passe\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Entrez le mot de passe\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "mot de passe trop long\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "réponse de l'agent invalide\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "annulé par l'utilisateur\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problème avec l'agent : l'agent renvoie 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 msgid "can't query passphrase in batch mode\n"
 msgstr "impossible de demander la phrase de passe en mode automatique\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Entrez le mot de passe: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4788,17 +4562,17 @@
 "Vous avez besoin d'une phrase de passe pour déverrouiller la\n"
 "clé secrète pour l'utilisateur: « %s »\n"
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, 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:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "        (sous-clé de la clé principale ID %s)"
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Répétez le mot de passe: "
 
@@ -5701,12 +5475,12 @@
 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:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "la ligne d'entrée est plus longue que %d caractères\n"
@@ -5769,7 +5543,7 @@
 msgid "[ revoked]"
 msgstr "revoquée"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "expirée"
@@ -5779,102 +5553,102 @@
 msgid "[ unknown]"
 msgstr "inconnu"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 #, fuzzy
 msgid "[marginal]"
 msgstr "marginale"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 #, fuzzy
 msgid "[ultimate]"
 msgstr "ultime"
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "indéfini"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "jamais"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "marginale"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "pleine"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "ultime"
 
-#: g10/trustdb.c:574
+#: 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:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, 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:589
+#: 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:604
+#: 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:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "clé publique %s non trouvée : %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "faites un --check-trustdb\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "vérifier la base de confiance\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, 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:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "aucune clé de confiance ultime n'a été trouvée\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, 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:1986
+#: g10/trustdb.c:1987
 #, 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:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5882,7 +5656,7 @@
 "profondeur: %d  valide: %3d  signé: %3d\n"
 "confiance: %d-. %dg. %dn. %dm. %df. %du\n"
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6156,6 +5930,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "quitter"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
@@ -6194,6 +5972,170 @@
 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 "q"
+#~ msgstr "q"
+
+#~ msgid "admin"
+#~ msgstr "admin"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "list"
+#~ msgstr "lister"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "déboguer"
+
+#~ msgid "name"
+#~ msgstr "nom"
+
+#~ msgid "url"
+#~ msgstr "url"
+
+#~ msgid "fetch"
+#~ msgstr "chercher"
+
+#~ msgid "login"
+#~ msgstr "identification"
+
+#~ msgid "lang"
+#~ msgstr "langue"
+
+#~ msgid "sex"
+#~ msgstr "sexe"
+
+# g10/keyedit.c:556 ???
+#~ msgid "cafpr"
+#~ msgstr "emprac"
+
+#~ msgid "forcesig"
+#~ msgstr "forcersig"
+
+#~ msgid "generate"
+#~ msgstr "générer"
+
+#~ msgid "passwd"
+#~ msgstr "mot.pas"
+
+#~ msgid "save"
+#~ msgstr "enregistrer"
+
+# g10/keyedit.c:556 ???
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "clé"
+
+#~ msgid "check"
+#~ msgstr "vérifier"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "signer"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "tsign"
+#~ msgstr "tsigner"
+
+#~ msgid "lsign"
+#~ msgstr "lsigner"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsigner"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsigner"
+
+#~ msgid "adduid"
+#~ msgstr "aj.ut"
+
+#~ msgid "addphoto"
+#~ msgstr "aj.photo"
+
+#~ msgid "deluid"
+#~ msgstr "suppr.ut"
+
+#~ msgid "delphoto"
+#~ msgstr "suppr.photo"
+
+#~ msgid "addkey"
+#~ msgstr "aj.clé"
+
+#~ msgid "addcardkey"
+#~ msgstr "ajclécarte"
+
+#~ msgid "keytocard"
+#~ msgstr "cléverscarte"
+
+#~ msgid "delkey"
+#~ msgstr "suppr.clé"
+
+#~ msgid "addrevoker"
+#~ msgstr "aj.rev"
+
+#~ msgid "delsig"
+#~ msgstr "suppr.sign"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "principale"
+
+#~ msgid "toggle"
+#~ msgstr "changer"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "préf"
+
+#~ msgid "showpref"
+#~ msgstr "montr.préf"
+
+#~ msgid "setpref"
+#~ msgstr "mettre.préf"
+
+#~ msgid "updpref"
+#~ msgstr "préf.màj"
+
+#~ msgid "keyserver"
+#~ msgstr "servclés"
+
+#~ msgid "trust"
+#~ msgstr "confi."
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revclé"
+
+#~ msgid "disable"
+#~ msgstr "désactiver"
+
+#~ msgid "enable"
+#~ msgstr "activer"
+
+#~ msgid "showphoto"
+#~ msgstr "montr.photo"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr ""
 #~ "l'algorithme de hachage `%s' ne marche qu'en lecture seule dans cette\n"
Index: gnupg/po/gl.po
diff -u gnupg/po/gl.po:1.13 gnupg/po/gl.po:1.14
--- gnupg/po/gl.po:1.13	Fri Dec 10 23:20:52 2004
+++ gnupg/po/gl.po	Tue Dec 14 08:49:27 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion at ceu.fi.udc.es>\n"
@@ -30,7 +30,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -355,7 +355,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -566,165 +566,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "omítese: a chave secreta xa está presente\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "abandonar"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "saír deste menú"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "s"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "axuda"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "listar"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Chave dispoñible en: "
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "depurar"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "enable"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsign"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia-la fecha de expiración"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "erro xeral"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "xerar un novo par de chaves"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
@@ -772,7 +695,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -782,13 +705,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: 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:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1252,7 +1175,7 @@
 msgid "Pubkey: "
 msgstr "Pública: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "Cifra: "
 
@@ -1260,7 +1183,7 @@
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Compresión: "
 
@@ -1364,7 +1287,7 @@
 msgid "reading options from `%s'\n"
 msgstr "lendo as opcións de `%s'\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: ¡%s non é para uso normal!\n"
@@ -1375,338 +1298,338 @@
 msgstr ""
 "non se cargou a extensión de cifrado \"%s\" debido a permisos inseguros\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcións de importación non válidas\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcións de importación non válidas\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s non se admite con %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s non ten sentido empregándoo con %s!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 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/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 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/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non é válido\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificación seleccionado non é válido\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, 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/g10.c:2744
+#: g10/g10.c:2742
 #, 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/g10.c:2746
+#: g10/g10.c:2744
 #, 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/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desaconséllase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 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/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non válidas\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non válidas\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non válidas\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresión personais non válidas\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "¡%s aínda non traballa con %s!\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, 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/g10.c:2862
+#: g10/g10.c:2860
 #, 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/g10.c:2867
+#: g10/g10.c:2865
 #, 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/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 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/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, 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/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, 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/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-de-usuario"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-de-usuario"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o envío ao servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepción do servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportación da chave fallou: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualización no servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a súa mensaxe ...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1714,23 +1637,23 @@
 "un nome de notación só debe ter caracteres imprimibles ou espacios, e debe "
 "rematar en '='\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nome de notación de usuario debe conte-lo carácter '@'\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notación non pode empregar ningún carácter de control\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificación dado non é válido\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
@@ -2598,12 +2521,12 @@
 msgstr "O ID de usuario \"%s\" está revocado."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "¿Está seguro de que quere asinalo? (s/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
@@ -2803,7 +2726,7 @@
 msgid "Really sign? (y/N) "
 msgstr "¿Asinar de verdade? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2856,18 +2779,10 @@
 msgstr "movendo a sinatura dunha chave ó seu sitio\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "gardar"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "gardar e saír"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "amosar fingerprint"
 
@@ -2876,506 +2791,359 @@
 msgstr "listar chave e IDs de usuario"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "chave"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "selecciona-la chave secundaria N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "verificar"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "listar sinaturas"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "v"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "asina-la chave"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "f"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "sign"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "facer unha sinatura separada"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "asina-la chave localmente"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "asina-la chave de xeito non revocable"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "asina-la chave localmente e de xeito non revocable"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "engadir unha identificación fotográfica"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "borrar un ID de usuario"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "engadir unha chave secundaria"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "engadir unha chave de revocación"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "borrar sinaturas"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "cambia-la fecha de expiración"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primary"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "cambiar entre o listado de chaves públicas e secretas"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "c"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "preferencias actualizadas"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "erro do servidor de chaves"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "revocar un ID de usuario"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "amosa-la identificación fotográfica"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, 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:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "A chave secreta está disponible.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Cómpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "A chave está revocada."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "¿Seguro de que quere asinar tódolos IDs de usuario? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, 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:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "¡Non pode borra-lo último ID de usuario!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, 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:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "¿Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "¿Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, 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:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "¿Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, 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:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "¿Seguro de que quere revocar este ID de usuario? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "¿Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "¿Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, 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:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "¿Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "¿Garda-los cambios? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "¿Saír sin gardar? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualización fallou: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Características: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, 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:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Esta chave está desactivada"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 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:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3383,19 +3151,19 @@
 "Teña en conta que a validez da chave amosada non é necesariamente\n"
 "correcta a menos que reinicie o programa.\n"
 
-#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3403,7 +3171,7 @@
 "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:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3412,47 +3180,47 @@
 "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:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "¿Está seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:2607
+#: g10/keyedit.c:2608
 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:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura descoñecida? (s/N/q)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3462,165 +3230,165 @@
 "designado\n"
 "       pode facer que algunhas versións de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:2885
+#: g10/keyedit.c:2886
 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:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 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:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n"
 
-#: g10/keyedit.c:2984
+#: g10/keyedit.c:2985
 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:2990
+#: g10/keyedit.c:2991
 #, 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:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as seleccións das chaves secretas.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como máximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando a data de expiración para a chave secundaria.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiración da chave primaria.\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, 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:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "¿Está seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3497
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "¿Está seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Non hai chave secundaria con índice %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, 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:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¿Está seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:3738
+#: g10/keyedit.c:3739
 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:3765
+#: g10/keyedit.c:3766
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¿Realmente desexa crea-los certificados de revocación? (s/N) "
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, 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:4126
+#: g10/keyedit.c:4127
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3950,7 +3718,7 @@
 "Necesita un contrasinal para protexe-la súa chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4213,7 +3981,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opcións de exportación non válidas\n"
@@ -4228,107 +3996,107 @@
 msgid "key not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "asinado coa súa chave %08lX no %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 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:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "a recepción do servidor de chaves fallou: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non é un ID de chave válido\n"
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, 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:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
@@ -4505,7 +4273,7 @@
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "descoñecido"
 
@@ -4682,50 +4450,50 @@
 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:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non está dispoñible nesta sesión\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "non se pode estabrece-lo pid do cliente para o axente\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "non se pode obte-lo FD de lectura do servidor para o axente\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "non se pode obte-lo FD de escritura do servidor para o axente\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, 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:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicación con gpg-agent\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema co axente - desactivando o emprego do axente\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4736,41 +4504,41 @@
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Repita o contrasinal\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Introduza o contrasinal\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "contrasinal demasiado longo\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "resposta do axente non válida\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, 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:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Introduza o contrasinal: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4780,17 +4548,17 @@
 "Necesita un contrasinal para desbloquea-la chave secreta para\n"
 "o usuario \""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits, chave %s, ID %08lX, creada %s"
 
-#: g10/passphrase.c:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Repita o contrasinal: "
 
@@ -5686,12 +5454,12 @@
 "a base de datos de confianza está corrompida; execute \"gpg --fix-trustdb"
 "\".\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "a liña de entrada contén máis de %d caracteres\n"
@@ -5751,7 +5519,7 @@
 msgid "[ revoked]"
 msgstr "[revocada] "
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada ]"
@@ -5761,101 +5529,101 @@
 msgid "[ unknown]"
 msgstr "descoñecido"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "nunca     "
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: 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:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, 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:589
+#: 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:604
+#: 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:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, 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:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "por favor, execute con --check-trustdb\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, 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:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "non se atoparon chaves de confianza absoluta\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, 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:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, 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"
@@ -6128,6 +5896,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "abandonar"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "aA"
@@ -6165,6 +5937,158 @@
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 
+#~ msgid "q"
+#~ msgstr "s"
+
+#~ msgid "help"
+#~ msgstr "axuda"
+
+#~ msgid "list"
+#~ msgstr "listar"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "depurar"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsign"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fpr"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "erro xeral"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "gardar"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "chave"
+
+#~ msgid "check"
+#~ msgstr "verificar"
+
+#~ msgid "c"
+#~ msgstr "v"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "f"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "sign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "addkey"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "primary"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "c"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "erro do servidor de chaves"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "o algoritmo de resumo `%s' é de só lectura nesta versión\n"
 
Index: gnupg/po/hu.po
diff -u gnupg/po/hu.po:1.8 gnupg/po/hu.po:1.9
--- gnupg/po/hu.po:1.8	Fri Dec 10 23:20:52 2004
+++ gnupg/po/hu.po	Tue Dec 14 08:49:27 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc László <nfl at nfllab.com>\n"
 "Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
@@ -30,7 +30,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -353,7 +353,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -564,165 +564,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs már jelen van.\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "kilépés|kilepes"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "kilépés ebbõl a menübõl"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "q"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "help"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "megmutatja ezt a súgót"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "list"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs található: "
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "debug"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "enable"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsign"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "lejárat megváltoztatása"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "kulcstulajdonos megbízhatóságának beállítása"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "általános hiba"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "új kulcspár létrehozása"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Parancs> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Érvénytelen parancs! (Próbálja a súgót: \"help\".)\n"
 
@@ -767,7 +690,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -777,13 +700,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opció nem mûködik ehhez a parancshoz.\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: 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:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1239,7 +1162,7 @@
 msgid "Pubkey: "
 msgstr "Nyilvános kulcsú (pubkey): "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "Rejtjelezõ (cipher): "
 
@@ -1247,7 +1170,7 @@
 msgid "Hash: "
 msgstr "Kivonatoló (hash): "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Tömörítõ (compression): "
 
@@ -1351,7 +1274,7 @@
 msgid "reading options from `%s'\n"
 msgstr "Az opciókat a \"%s\" állományból olvasom.\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MEGJEGYZÉS: %s nem normál használatra van!\n"
@@ -1361,336 +1284,336 @@
 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/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: Érvénytelen import opciók!\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: Érvénytelen import opciók!\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, 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/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core állományt hozhat létre!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hatástalanítja %s-t!\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s és %s nem használható együtt!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s értelmetlen %s mellett!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 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/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 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/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiválasztott rejtjelezõ algoritmus érvénytelen!\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiválasztott rejtjelezõ algoritmus érvénytelen!\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazoláshoz kiválasztott kivonatoló algoritmus érvénytelen!\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-nál!\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-nél!\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, 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/g10.c:2744
+#: g10/g10.c:2742
 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/g10.c:2746
+#: g10/g10.c:2744
 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/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZÉS: Egyszerû S2K mód (0) erõsen ellenjavallt!\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "Érvénytelen S2K mód; 0, 1 vagy 3 lehet.\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "Érvénytelen alapértelmezett preferenciák!\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "Érvénytelen személyes rejtjelezõ-preferenciák!\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "Érvénytelen személyes kivonatolópreferenciák!\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "Érvénytelen személyes tömörítõpreferenciák!\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s és %s egyelõre nem használható együtt!\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, 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/g10.c:2862
+#: g10/g10.c:2860
 #, 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/g10.c:2867
+#: g10/g10.c:2865
 #, 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/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 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/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [fájlnév]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [fájlnév]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [fájlnév]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [fájlnév]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, 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/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [fájlnév]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [fájlnév]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [fájlnév]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, 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/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [fájlnév]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [fájlnév]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [fájlnév]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonosító"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonosító"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key felh-azonosító"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key felh-azonosító"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonosító [parancsok]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [felh-azonosító] [kulcskarika]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Vétel a kulcsszerverrõl sikertelen: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexportálás sikertelen: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keresés a kulcsszerveren sikertelen: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Frissítés a kulcsszerverrõl sikertelen: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Páncél eltávolítása nem sikerült: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[fájlnév]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti gépelni az üzenetet...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1698,23 +1621,23 @@
 "Egy jelölés neve csak nyomtatható karaktereket és szóközt tartalmazhat, és = "
 "jellel kell befejezõdjön.\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Egy felhasználójelölésnek tartalmaznia kell a \"@\" karaktert!\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "Egy jelölés értékében nem szerepelhet vezérlõkarakter!\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazolási eljárásmód URL-je érvénytelen!\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 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/g10.c:3944
+#: g10/g10.c:3942
 #, 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"
@@ -2583,12 +2506,12 @@
 msgstr "\"%s\" felhasználói azonosítót visszavonták."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  Nem tudom aláírni.\n"
 
@@ -2788,7 +2711,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Valóban aláírja? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2841,18 +2764,10 @@
 msgstr "Átrakom a kulcsaláírást a megfelelõ helyre.\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "save"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "mentés és kilépés"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
@@ -2861,504 +2776,357 @@
 msgstr "kilistázza a kulcs- és felhasználóazonosítókat"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "N. felhasználói azonosító kiválasztása"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "key"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "N. másodlagos kulcs kiválasztása"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "check"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "aláírások kilistázása"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "kulcs aláírása"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "sign"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "különálló aláírás készítése"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "kulcs helyi aláírása"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "kulcs nem visszavonható aláírása"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "kulcs nem visszavonható helyi aláírása"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "felhasználói azonosító hozzáadása"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "fotóazonosító hozzáadása"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "felhasználói azonosító törlése"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "másodlagos kulcs (alkulcs) hozzáadása"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "másodlagos kulcs törlése"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "visszavonó kulcs hozzáadása"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "aláírások törlése"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "lejárat megváltoztatása"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primary"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "felhasználóazonosító megjelölése elsõdlegesként"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "váltás a titkos és a nyilvános kulcs listázása között"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "preferenciák listázása (szakértõ)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "preferenciák listázása (részletes)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "preferencialista beállítása"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "preferenciák frissítése"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "kulcsszerverhiba"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "jelszóváltoztatás"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "kulcstulajdonos megbízhatóságának beállítása"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "aláírások visszavonása"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "felhasználói azonosító visszavonása"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "másodlagos kulcs visszavonása"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "kulcs tiltása"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "kulcs engedélyezése"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "fotóazonosító megmutatása"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Hiba \"%s\" titkoskulcs-blokk olvasásakor: %s.\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Titkos kulcs rendelkezésre áll.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Ehhez szükség van a titkos kulcsra.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Kérem, használja elõbb a \"toggle\" parancsot!\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "A kulcsot visszavonták."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Valóban aláírja az összes felhasználóazonosítót? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 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:1527
+#: g10/keyedit.c:1528
 #, 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:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 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:1551
+#: g10/keyedit.c:1552
 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:1553
+#: g10/keyedit.c:1554
 #, 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:1554
+#: g10/keyedit.c:1555
 #, 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:1604
+#: g10/keyedit.c:1605
 #, 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:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Legalább egy kulcsot ki kell választania!\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Legalább egy kulcsot ki kell választania!\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, 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:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Valóban törli ezt a kulcsot? "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, 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:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Valóban visszavonja ezt a felhasználóazonosítót? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Valóban visszavonja a kijelölt kulcsokat? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Valóban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "preferencialista beállítása"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, 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:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Valóban frissítsem a preferenciákat? "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Mentsem a változtatásokat? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kilépjek mentés nélkül? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 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:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Jellemzõk: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, 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:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (érzékeny)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozható létre: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lejár: %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lejár: %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 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:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3366,19 +3134,19 @@
 "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:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3386,7 +3154,7 @@
 "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:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3396,45 +3164,45 @@
 "okozhatja,\n"
 "          hogy a PGP egyes verziói visszautasítják ezt a kulcsot.\n"
 
-#: g10/keyedit.c:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Továbbra is hozzá akarja adni? (i/N) "
 
-#: g10/keyedit.c:2607
+#: g10/keyedit.c:2608
 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:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Törli ezt a jó aláírást? (i/N/k)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Törli ezt az érvénytelen aláírást? (i/N/k)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Törli ezt az ismeretlen aláírást? (i/N/k)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Valóban törli ezt az önaláírást? (i/N)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Töröltem %d aláírást.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Töröltem %d aláírást.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Nem töröltem semmit.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3444,162 +3212,162 @@
 "          azt okozhatja, hogy egyes PGP verziók visszautasítják ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:2885
+#: g10/keyedit.c:2886
 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:2905
+#: g10/keyedit.c:2906
 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:2928
+#: g10/keyedit.c:2929
 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:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 #, 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:2984
+#: g10/keyedit.c:2985
 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:2990
+#: g10/keyedit.c:2991
 #, 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:3051
+#: g10/keyedit.c:3052
 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:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Maximum egy másodlagos kulcsot jelöljön ki, kérem!\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Másodlagos kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Elsõdleges kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelelõ aláírás a titkoskulcs-karikán.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 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:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, 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:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy használni akarja (i/N)? "
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3497
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy használni akarja (i/N)? "
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d indexû felhasználóazonosító!\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nincs %d indexû másodlagos kulcs!\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhasználóazonosító: \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, 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:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (nem exportálható)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az aláírás lejárt %s idõpontban.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy mégis visszavonja? (i/N) "
 
-#: g10/keyedit.c:3738
+#: g10/keyedit.c:3739
 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:3765
+#: g10/keyedit.c:3766
 #, 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:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem exportálható)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX által %s idõpontban.\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "A következõ aláírásokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Valóban létrehozzam a visszavonó igazolást? (i/N) "
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, 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:3957
+#: g10/keyedit.c:3958
 #, 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:4126
+#: g10/keyedit.c:4127
 #, 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"
@@ -3928,7 +3696,7 @@
 "Most szükség van egy jelszóra (vagy mondatra), amely a titkos kulcsát védi.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4191,7 +3959,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "Érvénytelen export opciók!\n"
@@ -4206,107 +3974,107 @@
 msgid "key not found on keyserver\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, 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:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, 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:1092
+#: g10/keyserver.c:1097
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Vétel a kulcsszerverrõl sikertelen: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, 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:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n"
@@ -4486,7 +4254,7 @@
 msgid "textmode"
 msgstr "Szövegmódú"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "Ismeretlen módú"
 
@@ -4662,52 +4430,52 @@
 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:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG ügynök nem elérhetõ ebben a munkafolyamatban.\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "Nem tudom beállítani a kliens pid-et az ügynöknek.\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "Nem tudom lekérni a szerver olvasási állományleíróját az ügynöknek.\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "Nem tudom lekérni a szerver írási állományleíróját az ügynöknek.\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "Nem megfelelõ formájú GPG_AGENT_INFO környezeti változó!\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "%d gpg-agent protokollverzió nem támogatott!\n"
 
-#: g10/passphrase.c:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunikációs probléma a gpg ügynökkel!\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 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:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr ""
 " \n"
 "  (fõ kulcsazonosító: %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4719,41 +4487,41 @@
 "\"%.*s\"\n"
 "%u bites %s key, azonosító: %08lX, létrehozva: %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Ismételje meg a jelszót!\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Írja be a jelszót!\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "A jelszó túl hosszú!\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "Érvénytelen válasz az ügynöktõl!\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "A felhasználó megszakította a mûveletet.\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "Probléma az ügynökkel: ügynök válasza: 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, 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:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Írja be a jelszót: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4764,17 +4532,17 @@
 "használatához:\n"
 "\""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, 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:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Ismételje meg a jelszót: "
 
@@ -5658,12 +5426,12 @@
 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:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "A bemeneti sor hosszabb, mint %d karakter.\n"
@@ -5723,7 +5491,7 @@
 msgid "[ revoked]"
 msgstr "[visszavont] "
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[lejárt]     "
@@ -5733,101 +5501,101 @@
 msgid "[ unknown]"
 msgstr "Ismeretlen módú"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "soha      "
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: 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:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, 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:589
+#: 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:604
+#: 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:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, 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:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "Kérem, hajtson végre egy --check-trustdb parancsot!\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "Ellenõrzöm a bizalmi adatbázist.\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, 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:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "Nem találtam alapvetõen megbízható kulcsot.\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, 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:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, 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"
@@ -6099,6 +5867,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "kilépés|kilepes"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "kK"
@@ -6136,6 +5908,158 @@
 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 "q"
+#~ msgstr "q"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "list"
+#~ msgstr "list"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsign"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fpr"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "általános hiba"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "save"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "key"
+
+#~ msgid "check"
+#~ msgstr "check"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "sign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "addkey"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "primary"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "kulcsszerverhiba"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "\"%s\" kivonatoló algoritmus csak olvasható ebben a kiadásban\n"
 
Index: gnupg/po/id.po
diff -u gnupg/po/id.po:1.18 gnupg/po/id.po:1.19
--- gnupg/po/id.po:1.18	Fri Dec 10 23:20:51 2004
+++ gnupg/po/id.po	Tue Dec 14 08:49:27 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h at gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
@@ -32,7 +32,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -355,7 +355,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -566,165 +566,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "q|k|keluar"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "q"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "bantuan"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "tampilkan"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "debug"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "enable"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsign"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "Kesalahan umum"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
@@ -769,7 +692,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -779,13 +702,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1243,7 +1166,7 @@
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "Cipher: "
 
@@ -1251,7 +1174,7 @@
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Kompresi: "
 
@@ -1355,7 +1278,7 @@
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
@@ -1365,344 +1288,344 @@
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 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/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, 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/g10.c:2744
+#: g10/g10.c:2742
 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/g10.c:2746
+#: g10/g10.c:2744
 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/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, 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/g10.c:2862
+#: g10/g10.c:2860
 #, 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/g10.c:2867
+#: g10/g10.c:2865
 #, 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/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, 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/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, 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/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1710,23 +1633,23 @@
 "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
 "dan diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -2595,12 +2518,12 @@
 msgstr "User ID \"%s\" dibatalkan."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
@@ -2804,7 +2727,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2857,18 +2780,10 @@
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "simpan"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "tampilkan fingerprint"
 
@@ -2877,504 +2792,357 @@
 msgstr "tampilkan kunci dan ID user"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "kunci"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "pilih kunci sekunder N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "periksa"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "tampilkan signature"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "tandai"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "tandai kunci"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "tandai"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "buat detached signature"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "tandai kunci secara lokal"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "tandai kunci sebagai tidak dapat dibatalkan"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "tandai kunci secara lokal dan tidak dapat dibatalkan"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "tambah kunci sekunder"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "tambah kunci pembatalan"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "hapus signature"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primer"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "perbarui preferensi"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "kesalahan keyserver"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "batalkan sebuah ID user"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "tampilkan photo ID"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan"
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, 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:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Benar-benar hapus ID user ini? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 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:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3382,19 +3150,19 @@
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3402,7 +3170,7 @@
 "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:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3412,45 +3180,45 @@
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:2607
+#: g10/keyedit.c:2608
 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:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3460,165 +3228,165 @@
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:2885
+#: g10/keyedit.c:2886
 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:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 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:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 #, 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:2984
+#: g10/keyedit.c:2985
 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:2990
+#: g10/keyedit.c:2991
 #, 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:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, 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:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3497
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Tidak ada kunci sekunder dengan index %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, 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:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:3738
+#: g10/keyedit.c:3739
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:3765
+#: g10/keyedit.c:3766
 #, 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:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, 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:4126
+#: g10/keyedit.c:4127
 #, 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"
@@ -3944,7 +3712,7 @@
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4206,7 +3974,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opsi ekspor tidak valid\n"
@@ -4221,106 +3989,106 @@
 msgid "key not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, 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:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
@@ -4497,7 +4265,7 @@
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "tidak dikenal"
 
@@ -4671,50 +4439,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "tidak dapat menset pid client untuk agen\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "tidak dapat membuat server membaca FD untuk agen\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "tidak dapat membuat server menulis FD untuk agen\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: g10/passphrase.c:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "masalah komunikasi dengan gpg-agent\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "masalah dengan agen - tiadakan penggunaan agen\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID kunci utama %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4725,41 +4493,41 @@
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Ulangi passphrase\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Masukkan passphrase\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "passphrase terlalu panjang\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "respon tidak valid dari agen\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "tidak dapat meminta password dalam mode batch\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Masukkan passphrase: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4769,17 +4537,17 @@
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
@@ -5664,12 +5432,12 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "baris input lebih dari %d karakter\n"
@@ -5728,7 +5496,7 @@
 msgid "[ revoked]"
 msgstr "[revoked] "
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expired] "
@@ -5738,101 +5506,101 @@
 msgid "[ unknown]"
 msgstr "tidak dikenal"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "tidak pernah..."
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
 
-#: g10/trustdb.c:589
+#: 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:604
+#: 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:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "lakukanlah --check-trustdb\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n"
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, 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:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@ -6104,6 +5872,10 @@
 msgid "nN"
 msgstr "tT"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "q|k|keluar"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "kK"
@@ -6142,6 +5914,158 @@
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "help"
+#~ msgstr "bantuan"
+
+#~ msgid "list"
+#~ msgstr "tampilkan"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsign"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fpr"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "Kesalahan umum"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "simpan"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "kunci"
+
+#~ msgid "check"
+#~ msgstr "periksa"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "tandai"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "tandai"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "addkey"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "primer"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "kesalahan keyserver"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "algoritma digest `%s' adalah hanya-baca dalam rilis ini\n"
 
Index: gnupg/po/it.po
diff -u gnupg/po/it.po:1.71 gnupg/po/it.po:1.72
--- gnupg/po/it.po:1.71	Fri Dec 10 23:20:50 2004
+++ gnupg/po/it.po	Tue Dec 14 08:49:27 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <md at linux.it>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -30,7 +30,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -356,7 +356,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -568,165 +568,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica già presente\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "quit"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "abbandona questo menù"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "q"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "help"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "list"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Chiave disponibile presso: "
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "debug"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "abilita"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsign"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia la data di scadenza"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia il valore di fiducia"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "errore generale"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
@@ -771,7 +694,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -781,13 +704,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1254,7 +1177,7 @@
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "Cifrari: "
 
@@ -1262,7 +1185,7 @@
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Compressione: "
 
@@ -1367,7 +1290,7 @@
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
@@ -1379,338 +1302,338 @@
 "l'estensione crittografica \"%s\" non è stata caricata a causa dei\n"
 "permessi insicuri.\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non è un set di caratteri valido\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non è permesso usare %s con %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 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/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 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/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non è valido\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non è valido\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, 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/g10.c:2744
+#: g10/g10.c:2742
 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/g10.c:2746
+#: g10/g10.c:2744
 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/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) è fortemente scoraggiato\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, 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/g10.c:2862
+#: g10/g10.c:2860
 #, 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/g10.c:2867
+#: g10/g10.c:2865
 #, 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/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 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/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non è possibile usare %s in modalità %s\n"
 
-#: g10/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, 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/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1718,23 +1641,23 @@
 "il nome di una nota deve essere formato solo da caratteri stampabili o\n"
 "spazi e terminare con un '='\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non è valido\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non è valido\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non è valido\n"
@@ -2608,12 +2531,12 @@
 msgstr "L'user ID \"%s\" è stato revocato."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
@@ -2815,7 +2738,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2868,18 +2791,10 @@
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "save"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "salva ed esci"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "mostra le impronte digitali"
 
@@ -2888,504 +2803,357 @@
 msgstr "elenca le chiavi e gli user ID"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "key"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "scegli la chiave secondaria N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "check"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "elenca le firme"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "firma la chiave"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "sign"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "fai una firma separata"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "firma la chiave localmente"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "firma la chiave irrevocabilmente"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "firma la chiave localmente e irrevocabilmente"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "cancella un user ID"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "aggiungi una chiave secondaria"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "aggiungi una chiave di revoca"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsign"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "cancella le firme"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "cambia la data di scadenza"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primary"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "imposta l'user ID come primario"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "preferenze aggiornate"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "errore del keyserver"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "revoca un user ID"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "abilita"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "mostra l'ID fotografico"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "errore leggendo il keyblock segreto `%s': %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "È disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "La chiave è stata revocata."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, 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:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Revoco davvero questo user ID? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, 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:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non è cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, 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:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Questa chiave è stata disabilitata"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 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:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3394,19 +3162,19 @@
 "corretta\n"
 "finchè non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3415,7 +3183,7 @@
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3424,46 +3192,46 @@
 "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:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:2607
+#: g10/keyedit.c:2608
 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:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Non è stato cancellato nulla.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3473,168 +3241,168 @@
 "            designato può causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:2885
+#: g10/keyedit.c:2886
 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:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 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:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 #, 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:2984
+#: g10/keyedit.c:2985
 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:2990
+#: g10/keyedit.c:2991
 #, 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:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, 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:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3497
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, 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:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave è scaduta il %s.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3738
+#: g10/keyedit.c:3739
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:3765
+#: g10/keyedit.c:3766
 #, 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:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" è già stato revocato\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, 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:4126
+#: g10/keyedit.c:4127
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3963,7 +3731,7 @@
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4228,7 +3996,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opzioni di esportazione non valide\n"
@@ -4243,22 +4011,22 @@
 msgid "key not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
@@ -4266,84 +4034,84 @@
 "firmata con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, 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:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
@@ -4520,7 +4288,7 @@
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "sconosciuto"
 
@@ -4698,50 +4466,50 @@
 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:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non è disponibile in questa sessione\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "impossibile impostare il pid del client dell'agent\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "impossibile ottenere il FD di lettura dell'agent\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "impossibile ottenere il FD di scrittura dell'agent\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, 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:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "problema di comunicazione con gpg-agent\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con l'agent - uso dell'agent disattivato\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (key ID principale %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4752,41 +4520,41 @@
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Ripeti la passphrase\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Inserisci la passphrase\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "passphrase troppo lunga\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "risposta non valida dall'agent\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "impossibile chiedere la password in modo batch\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4796,17 +4564,17 @@
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, 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:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
@@ -5712,12 +5480,12 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Il trustdb è danneggiato; eseguire \"gpg --fix-trust-db\".\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linea di input più lunga di %d caratteri\n"
@@ -5777,7 +5545,7 @@
 msgid "[ revoked]"
 msgstr "[revocata]"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[scaduta]"
@@ -5787,101 +5555,101 @@
 msgid "[ unknown]"
 msgstr "sconosciuto"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "non è necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimoi controllo del trustdb sarà fatto il %s\n"
 
-#: g10/trustdb.c:589
+#: 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:604
+#: 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:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chiave pubblica %08lX non trovata: %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "per favore usa --check-trustdb\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chiavi processate (%d conteggi di validità azzerati)\n"
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "non è stata trovata alcuna chiave definitivamente affidabile\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, 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:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, 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"
@@ -6154,6 +5922,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "quit"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
@@ -6191,6 +5963,158 @@
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "list"
+#~ msgstr "list"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "abilita"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsign"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fpr"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "errore generale"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "save"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "key"
+
+#~ msgid "check"
+#~ msgstr "check"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "sign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "addkey"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsign"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "primary"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "errore del keyserver"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "abilita"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "in questa versione l'algoritmo digest `%s' è in sola lettura\n"
 
Index: gnupg/po/ja.po
diff -u gnupg/po/ja.po:1.18 gnupg/po/ja.po:1.19
--- gnupg/po/ja.po:1.18	Fri Dec 10 23:20:45 2004
+++ gnupg/po/ja.po	Tue Dec 14 08:49:27 2004
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <iida at gnu.org>\n"
 "Language-Team: Japanese <translation-team-ja at lists.sourceforge.net>\n"
@@ -33,7 +33,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -349,7 +349,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP¥«¡¼¥Éno. %s¤ò¸¡½Ð\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 msgid "can't do this in batch mode\n"
 msgstr "¤½¤ì¤Ï¥Ð¥Ã¥Á¡¦¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n"
@@ -543,151 +543,79 @@
 msgid "secret key already stored on a card\n"
 msgstr "ÈëÌ©¸°¤Ï¤â¤¦¥«¡¼¥É¤ËÊݴɤ·¤Æ¤¢¤ê¤Þ¤¹\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "quit"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "¤³¤Î¥á¥Ë¥å¡¼¤ò½ªÎ»"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "q"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr "admin"
-
 #: g10/card-util.c:1252
 msgid "show admin commands"
 msgstr "´ÉÍý¥³¥Þ¥ó¥É¤òɽ¼¨"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "help"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "¤³¤Î¥Ø¥ë¥×¤òɽ¼¨"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "list"
-
 #: g10/card-util.c:1255
 msgid "list all available data"
 msgstr "Á´Í­¸ú¥Ç¡¼¥¿¤òɽ¼¨"
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "debug"
-
-#: g10/card-util.c:1258
-msgid "name"
-msgstr "name"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr "¥«¡¼¥É½êÍ­¼Ô¤Î̾Á°¤ÎÊѹ¹"
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr "url"
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr "¸°¤òõº÷¤¹¤ëURL¤ÎÊѹ¹"
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr "fetch"
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr "¥«¡¼¥ÉURL¤Ç»ØÄꤵ¤ì¤¿¸°¤Î°ú¤­½Ð¤·"
 
-#: g10/card-util.c:1262
-msgid "login"
-msgstr "login"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 msgid "change the login name"
 msgstr "¥í¥°¥¤¥ó̾¤ÎÊѹ¹"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr "lang"
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 msgid "change the language preferences"
 msgstr "¸À¸ìÁª¹¥¤ÎÊѹ¹"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr "sex"
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr "¥«¡¼¥É½êÍ­¼Ô¤ÎÀ­Ê̤ÎÊѹ¹"
 
-#: g10/card-util.c:1265
-msgid "cafpr"
-msgstr "cafpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 msgid "change a CA fingerprint"
 msgstr "CA»ØÌæ¤ÎÊѹ¹"
 
-#: g10/card-util.c:1266
-msgid "forcesig"
-msgstr "forcesig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr "½ð̾¶¯À©PIN¥Õ¥é¥°¤òȿž"
 
-#: g10/card-util.c:1268
-msgid "generate"
-msgstr "generate"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 msgid "generate new keys"
 msgstr "¿·¤·¤¤¸°·²¤òÀ¸À®"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr "PIN¥Ö¥í¥Ã¥¯¤Î²ò½ü¤äÊѹ¹¤Î¥á¥Ë¥å¡¼"
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "¥³¥Þ¥ó¥É> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 msgid "Admin-only command\n"
 msgstr "´ÉÍýÀìÍÑ¥³¥Þ¥ó¥É\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 msgid "Admin commands are allowed\n"
 msgstr "´ÉÍý¥³¥Þ¥ó¥É¤¬µö²Ä¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 msgid "Admin commands are not allowed\n"
 msgstr "´ÉÍý¥³¥Þ¥ó¥É¤Ï¶Ø»ß¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵¸ú¤Ê¥³¥Þ¥ó¥É (¡Èhelp¡É¤ò»²¾È)\n"
 
@@ -734,7 +662,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN¤ò¤Á¤ã¤ó¤È·«¤êÊÖ¤·¤Æ¤¤¤Þ¤»¤ó¡£ºÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -744,13 +672,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "¤³¤Î¥³¥Þ¥ó¥É¤Ç--output¤Ïµ¡Ç½¤·¤Þ¤»¤ó\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "¸°¡È%s¡É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1202,7 +1130,7 @@
 msgid "Pubkey: "
 msgstr "¸ø³«¸°: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "°Å¹æË¡: "
 
@@ -1210,7 +1138,7 @@
 msgid "Hash: "
 msgstr "¥Ï¥Ã¥·¥å: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "°µ½Ì: "
 
@@ -1314,7 +1242,7 @@
 msgid "reading options from `%s'\n"
 msgstr "¡Ö%s¡×¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߽Ф·¤Þ¤¹\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Ãí°Õ: ÉáÄÌ%s¤Ï»È¤¤¤Þ¤»¤ó!\n"
@@ -1324,348 +1252,348 @@
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "°ÂÁ´¤Ç¤Ê¤¤µö²Ä¤Î¤¿¤á¡¢°Å¹æË¡³ÈÄ¥¡Ö%s¡×¤ò¥í¡¼¥É¤·¤Þ¤»¤ó\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "¡Ö%s¡×¤Ï¡¢Í­¸ú¤Êʸ»ú½¸¹ç¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 msgid "could not parse keyserver URL\n"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤ÎURL¤ò²òÀÏÉÔǽ\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵¸ú¤Ê¸°¥µ¡¼¥Ð¡¼¡¦¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 msgid "invalid keyserver options\n"
 msgstr "̵¸ú¤Ê¸°¥µ¡¼¥Ð¡¼¡¦¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵¸ú¤ÊÆɹþ¤ß¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "̵¸ú¤ÊÆɹþ¤ß¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵¸ú¤Ê°ìÍ÷¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 msgid "invalid list options\n"
 msgstr "̵¸ú¤Ê°ìÍ÷¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵¸ú¤Ê¸¡¾Ú¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 msgid "invalid verify options\n"
 msgstr "̵¸ú¤Ê¸¡¾Ú¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path¤ò%s¤ËÀßÄêÉÔǽ\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "·Ù¹ð: ¥×¥í¥°¥é¥à¤Î¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤¬¤Ç¤­¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "·Ù¹ð: %s¤Ï%s¤è¤êÍ¥Àè\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s¤Ï%s¤È¤È¤â¤Ë»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s¤Ï%s¤È¤È¤â¤Ë»È¤Ã¤Æ¤â̵°ÕÌ£¤Ç¤¹!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2¥â¡¼¥É¤Ç¤ÏʬΥ½ð̾¤«¥¯¥ê¥¢½ð̾¤À¤±¤·¤«¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2614
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2¥â¡¼¥É¤Ç¤Ï½ð̾¤È°Å¹æ²½¤òƱ»þ¤Ë¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2620
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2¤ò»ØÄꤷ¤¿¤é¡¢(¥Ñ¥¤¥×¤Ç¤Ê¤¯) ¥Õ¥¡¥¤¥ë¤ò»ØÄꤻ¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
 
-#: g10/g10.c:2635
+#: g10/g10.c:2633
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2¥â¡¼¥É¤Î¥á¥Ã¥»¡¼¥¸°Å¹æ²½¤Ç¤Ï¡¢IDEA°Å¹æË¡¤¬É¬ÍפǤ¹\n"
 
-#: g10/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "ÁªÂò¤µ¤ì¤¿°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "ÁªÂò¤µ¤ì¤¿Í×Ì󥢥르¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 msgid "selected compression algorithm is invalid\n"
 msgstr "ÁªÂò¤µ¤ì¤¿°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "ÁªÂò¤µ¤ì¤¿¾ÚÌÀ½ñÍ×Ì󥢥르¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed¤ÏÀµ¤ÎÃͤ¬É¬ÍפǤ¹\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed¤Ï1¤è¤êÂ礭¤ÊÃͤ¬É¬ÍפǤ¹\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth¤Ï1¤«¤é255¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2742
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "̵¸ú¤Êdefault-cert-level¡£0¤«1¤«2¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2744
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵¸ú¤Êmin-cert-level¡£0¤«1¤«2¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Ãí°Õ: ñ½ã¤ÊS2K¥â¡¼¥É(0)¤Î»ÈÍѤˤ϶¯¤¯È¿ÂФ·¤Þ¤¹\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵¸ú¤ÊS2K¥â¡¼¥É¡£0¤«1¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "̵¸ú¤Ê´ûÄê¤ÎÁª¹¥\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "̵¸ú¤Ê¸Ä¿ÍÍѰŹæË¡¤ÎÁª¹¥\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "̵¸ú¤Ê¸Ä¿ÍÍÑÍ×Ìó¤ÎÁª¹¥\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "̵¸ú¤Ê¸Ä¿ÍÍÑ°µ½Ì¤ÎÁª¹¥\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s¤Ï%s¤Çµ¡Ç½¤·¤Þ¤»¤ó\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "°Å¹æ¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/g10.c:2862
+#: g10/g10.c:2860
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Í×Ì󥢥르¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/g10.c:2867
+#: g10/g10.c:2865
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "·Ù¹ð: ¸ø³«¸°°Å¹æ¤ò»È¤ï¤º¤Ë¡¢¼õ¼è¿Í (-r) ¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "¡Ö%s¡×¤ÎÂоΰŹæ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt¤ò--s2k-mode 0¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt¤ò--s2k-mode 0¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key ¥æ¡¼¥¶¡¼id"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key ¥æ¡¼¥¶¡¼id"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key ¥æ¡¼¥¶¡¼id"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key ¥æ¡¼¥¶¡¼id"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ¥æ¡¼¥¶¡¼id [¥³¥Þ¥ó¥É]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [¥æ¡¼¥¶¡¼id] [¸°ÎØ]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤Ø¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¤Î¼õ¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "¸°¤Î½ñ½Ð¤·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¸¡º÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤Î²óÉü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ÊñÁõ½üµî¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ÊñÁõ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵¸ú¤Ê¥Ï¥Ã¥·¥å¡¦¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤Ç¤¹\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "³«»Ï¤·¤Þ¤¹¡£¥á¥Ã¥»¡¼¥¸¤òÂǤäƤ¯¤À¤µ¤¤ ...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 "Ãí¼á̾¤Ë¤Ï°õ»ú²Äǽ¤Êʸ»ú¤«¶õÇò¤Î¤ß¤ò»È¤¤¡¢'='¤Ç½ª¤ï¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "¥æ¡¼¥¶¡¼Ãí¼á̾¤Ï¡¢'@'ʸ»ú¤ò´Þ¤Þ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "Ãí¼á̾¤ÎÃͤËÀ©¸æʸ»ú¤ò»È¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "¤¢¤¿¤¨¤é¤ì¤¿¾ÚÌÀ½ñ¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "¤¢¤¿¤¨¤é¤ì¤¿½ð̾¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "»ØÄꤵ¤ì¤¿Áª¹¥¸°¥µ¡¼¥Ð¡¼URL¤Ï̵¸ú¤Ç¤¹\n"
 
@@ -2521,12 +2449,12 @@
 msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "¤½¤ì¤Ç¤â¤³¤Î¸°¤Ë½ð̾¤·¤¿¤¤¤Ç¤¹¤«? (y/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  ½ð̾ÉÔǽ¡£\n"
 
@@ -2700,7 +2628,7 @@
 msgid "Really sign? (y/N) "
 msgstr "ËÜÅö¤Ë½ð̾¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2753,18 +2681,10 @@
 msgstr "¸°¤Î½ð̾¤òÀµ¤·¤¤¾ì½ê¤Ë°ÜÆ°¤·¤Þ¤¹\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "save"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "Êݸ¤·¤Æ½ªÎ»"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "»ØÌæ¤òɽ¼¨"
 
@@ -2773,484 +2693,340 @@
 msgstr "¸°¤È¥æ¡¼¥¶¡¼ID¤Î°ìÍ÷"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "¥æ¡¼¥¶¡¼ID N¤ÎÁªÂò"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "key"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "Éû¸°N¤ÎÁªÂò"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "check"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "½ð̾¤Î°ìÍ÷"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "¸°¤Ø½ð̾"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-msgid "tsign"
-msgstr "tsign"
-
 #: g10/keyedit.c:1259
 msgid "make a trust signature"
 msgstr "¿®Íѽð̾¤òºîÀ®"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "¸°¤ØÆâÉôŪ¤Ë½ð̾"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "¼º¸ú¤Ç¤­¤Ê¤¤¤è¤¦¸°¤Ø½ð̾"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "¼º¸ú¤Ç¤­¤Ê¤¤¤è¤¦¸°¤ØÆâÉôŪ¤Ë½ð̾"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "¥æ¡¼¥¶¡¼ID¤ÎÄɲÃ"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "¥Õ¥©¥ÈID¤ÎÄɲÃ"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "¥æ¡¼¥¶¡¼ID¤Îºï½ü"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "Éû¸°¤ÎÄɲÃ"
 
-#: g10/keyedit.c:1271
-msgid "addcardkey"
-msgstr "addcardkey"
-
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1272
 msgid "add a key to a smartcard"
 msgstr "¥¹¥Þ¡¼¥È¥«¡¼¥É¤Ø¸°¤ÎÄɲÃ"
 
-#: g10/keyedit.c:1272
-msgid "keytocard"
-msgstr "keytocard"
-
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr "¥¹¥Þ¡¼¥È¥«¡¼¥É¤Î¸°¤Ø¤Î°ÜÆ°"
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "Éû¸°¤Îºï½ü"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "¼º¸ú¸°¤ÎÄɲÃ"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "½ð̾¤Îºï½ü"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "ËþλÆü¤ÎÊѹ¹"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primary"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "¥æ¡¼¥¶¡¼ID¤ò¼ç¤Ë¤¹¤ë"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "ÈëÌ©¸°¤È¸ø³«¸°¤Î°ìÍ÷¤Îȿž"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "Áª¹¥¤Î°ìÍ÷ (¥¨¥­¥¹¥Ñ¡¼¥È)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "Áª¹¥¤Î°ìÍ÷ (¾éĹ)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "Áª¹¥¤Î°ìÍ÷¤òÀßÄê"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "Áª¹¥¤Î°ìÍ÷¤ò¹¹¿·"
 
-#: g10/keyedit.c:1286
-msgid "keyserver"
-msgstr "keyserver"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 msgid "set preferred keyserver URL"
 msgstr "Áª¹¥¸°¥µ¡¼¥Ð¡¼¤ÎURI¤òÀßÄê"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎÊѹ¹"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "½êÍ­¼Ô¿®ÍѤÎÊѹ¹"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "½ð̾¤Î¼º¸ú"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "¥æ¡¼¥¶¡¼ID¤Î¼º¸ú"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "Éû¸°¤Î¼º¸ú"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "¸°¤Î»ÈÍѤò¶Ø»ß¤¹¤ë"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "¸°¤Î»ÈÍѤòµö²Ä¤¹¤ë"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "¥Õ¥©¥ÈID¤òɽ¼¨"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "ÈëÌ©¸°¥Ö¥í¥Ã¥¯¡È%s¡É¤ÎÆɽФ·¥¨¥é¡¼: %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "ÈëÌ©¸°¤¬»ÈÍѤǤ­¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "¤³¤Î¼Â¹Ô¤Ë¤ÏÈëÌ©¸°¤¬¤¤¤ê¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "¤Þ¤º¡Ètoggle¡É¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "¸°¤Ï¡¢¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 msgid "Really sign all user IDs? (y/N) "
 msgstr "ËÜÅö¤ËÁ´¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "¥³¥Ä: ¤Þ¤º½ð̾¤¹¤ë¥æ¡¼¥¶¡¼ID¤òÁªÂò¤·¤Þ¤¹\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s¥â¡¼¥É¤Ç¤³¤Î¥³¥Þ¥ó¥É¤Ï¶Ø»ß¤Ç¤¹¡£\n"
 
-#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "¥æ¡¼¥¶¡¼ID¤ò¾¯¤Ê¤¯¤È¤â¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "ºÇ¸å¤Î¥æ¡¼¥¶¡¼ID¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "ÁªÂò¤·¤¿Á´¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 msgid "Really remove this user ID? (y/N) "
 msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 msgid "Really move the primary key? (y/N) "
 msgstr "¤³¤Î¼ç¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 msgid "You must select exactly one key.\n"
 msgstr "¸°¤ò¤­¤Ã¤«¤ê1ËÜÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "¸°¤ò¾¯¤Ê¤¯¤È¤â1ËÜÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "¤³¤Î¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "ÁªÂò¤·¤¿Á´¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 msgid "Really revoke this user ID? (y/N) "
 msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "¤³¤Î¸°¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "ÍøÍѼԻØÄê¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ÎÍøÍÑÃæ¡¢½êÍ­¼Ô¿®ÍѤÏÀßÄꤵ¤ì¤Ê¤¤¤³¤È¤â¤¢¤ê¤Þ"
 "¤¹¡£\n"
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 msgid "Set preference list to:\n"
 msgstr "Áª¹¥¤Î°ìÍ÷¤òÀßÄê:\n"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "ÁªÂò¤·¤¿¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤òËÜÅö¤Ë¹¹¿·¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1776
 msgid "Really update the preferences? (y/N) "
 msgstr "Áª¹¥¤òËÜÅö¤Ë¹¹¿·¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 msgid "Save changes? (y/N) "
 msgstr "Êѹ¹¤òÊݸ¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 msgid "Quit without saving? (y/N) "
 msgstr "Êݸ¤»¤º¤Ë½ªÎ»¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ÈëÌ©¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr "¸°¤Ï̵Êѹ¹¤Ê¤Î¤Ç¹¹¿·¤ÏÉÔÍפǤ¹¡£\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Í×Ìó: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "µ¡Ç½: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr "̵½¤Àµ¸°¥µ¡¼¥Ð¡¼"
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr "Áª¹¥¸°¥µ¡¼¥Ð¡¼: "
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "¤³¤Î¸°¤Ï¡¢%s¸°%s¤Ë¤è¤Ã¤Æ¼º¸ú¤µ¤ì¤¿¤è¤¦¤Ç¤¹"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2252
 msgid "(sensitive)"
 msgstr "(¥Ç¥ê¥±¡¼¥È)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, c-format
 msgid "created: %s"
 msgstr "ºîÀ®: %s"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, c-format
 msgid "revoked: %s"
 msgstr "¼º¸ú: %s"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, c-format
 msgid "expired: %s"
 msgstr "Ëþλ: %s"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, c-format
 msgid "expires: %s"
 msgstr "Ëþλ: %s"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, c-format
 msgid "usage: %s"
 msgstr "ÍøÍÑË¡: %s"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, c-format
 msgid "trust: %s"
 msgstr "¿®ÍÑ: %s"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr "Í­¸úÀ­: %s"
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "¤³¤Î¸°¤Ï»ÈÍѶػߤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr "¥«¡¼¥ÉÈÖ¹æ: "
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x·Á¼°¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤¬¡¢¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3258,17 +3034,17 @@
 "¥×¥í¥°¥é¥à¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç¡¢É½¼¨¤µ¤ì¤¿¸°¤ÎÍ­¸úÀ­¤ÏÀµ¤·¤¯¤Ê¤¤¤«¤â¤·¤ì¤Ê¤¤¡¢\n"
 "¤È¤¤¤¦¤³¤È¤òǰƬ¤Ë¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 msgid "revoked"
 msgstr "¼º¸ú"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 msgid "expired"
 msgstr "Ëþλ"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3276,7 +3052,7 @@
 "·Ù¹ð: ¼ç¤¿¤ë¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢Ê̤Ê\n"
 "              ¥æ¡¼¥¶¡¼ID¤¬¼ç¤Ë¤Ê¤ë¤È²¾Äꤹ¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3285,45 +3061,45 @@
 "·Ù¹ð: ¤³¤ì¤ÏPGP2·Á¼°¤Î¸°¤Ç¤¹¡£¥Õ¥©¥ÈID¤ÎÄɲäǡ¢°ìÉô¤ÎÈǤÎPGP¤Ï¡¢\n"
 "      ¤³¤Î¸°¤òµñÈݤ¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "¤½¤ì¤Ç¤âÄɲä·¤¿¤¤¤Ç¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:2607
+#: g10/keyedit.c:2608
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2·Á¼°¤Î¸°¤Ë¤Ï¥Õ¥©¥ÈID¤òÄɲäǤ­¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¤³¤ÎÀµ¤·¤¤½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¤³¤Î̵¸ú¤Ê½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¤³¤Î̤ÃΤνð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¤³¤Î¼«¸Ê½ð̾¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "²¿¤âºï½ü¤·¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3332,154 +3108,154 @@
 "·Ù¹ð: ¤³¤ì¤ÏPGP 2.x·Á¼°¤Î¸°¤Ç¤¹¡£»Ø̾¼º¸ú¼Ô¤ÎÄɲäǡ¢°ìÉô¤ÎÈǤÎPGP¤Ï¡¢\n"
 "      ¤³¤Î¸°¤òµñÈݤ¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:2885
+#: g10/keyedit.c:2886
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x·Á¼°¤Î¸°¤Ë¤Ï»Ø̾¼º¸ú¼Ô¤òÄɲäǤ­¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "»Ø̾¼º¸ú¼Ô¤Î¥æ¡¼¥¶¡¼ID¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x·Á¼°¤Î¸°¤Ï¡¢»Ø̾¼º¸ú¼Ô¤ËǤ̿¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:2943
+#: g10/keyedit.c:2944
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "»Ø̾¼º¸ú¼Ô¤Ë¤Ï¡¢¤½¤Î¸°¼«ÂΤòǤ̿¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:2965
+#: g10/keyedit.c:2966
 msgid "this key has already been designated as a revoker\n"
 msgstr "¤³¤Î¸°¤Ï¼º¸ú¼Ô¤È¤·¤Æ¤â¤¦»Ø̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:2984
+#: g10/keyedit.c:2985
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "·Ù¹ð: ¤¢¤ë¸°¤ò»Ø̾¼º¸ú¼Ô¤ËÀßÄꤹ¤ë¤È¡¢¸µ¤ËÌ᤻¤Þ¤»¤ó!\n"
 
-#: g10/keyedit.c:2990
+#: g10/keyedit.c:2991
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "ËÜÅö¤Ë¤³¤Î¸°¤ò»Ø̾¼º¸ú¼Ô¤ËǤ̿¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "ÈëÌ©¸°¤ÎÁªÂò¤ò¤È¤¤¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "¹â¡¹1¸Ä¤ÎÉû¸°¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Éû¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "¼ç¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3¸°¤ÎÍ­¸ú´ü¸Â¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "ÈëÌ©¸°ÎؤËÂбþ¤¹¤ë½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "¥æ¡¼¥¶¡¼ID¤ò¤­¤Ã¤«¤ê¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Îv3¼«¸Ê½ð̾¤ò¤È¤Ð¤·¤Þ¤¹\n"
 
-#: g10/keyedit.c:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr "Áª¹¥¸°¥µ¡¼¥Ð¡¼URL¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "ËÜÅö¤Ë¸ò´¹¤·¤¿¤¤¤Ç¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3497
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "ËÜÅö¤Ëºï½ü¤·¤¿¤¤¤Ç¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%dÈ֤Υ桼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%dÈÖ¤ÎÉû¸°¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "¥æ¡¼¥¶¡¼ID:¡È%s¡É\n"
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s¤Ç%s%s%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (½ñ½Ð¤·ÉÔ²Ä)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "¤³¤Î½ð̾¤Ï%s¤ÇËþλ¤Ç¤¹¡£\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¤½¤ì¤Ç¤âËÜÅö¤Ë¼º¸ú¤·¤¿¤¤¤Ç¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:3738
+#: g10/keyedit.c:3739
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "¤³¤Î½ð̾¤Ë¤¿¤¤¤¹¤ë¼º¸ú¾ÚÌÀ½ñ¤òºîÀ®¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:3765
+#: g10/keyedit.c:3766
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤Ë¸°%s¤Ç½ð̾¤·¤Þ¤·¤¿:\n"
 
-#: g10/keyedit.c:3791
+#: g10/keyedit.c:3792
 msgid " (non-revocable)"
 msgstr " (¼º¸úÉÔ²Ä)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "¤¢¤Ê¤¿¤Î¸°%s¤Ç%s¤Ë¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "¤³¤ì¤é¤Î½ð̾¤ò¼º¸ú¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¼º¸ú¾ÚÌÀ½ñ¤òËÜÅö¤ËºîÀ®¤·¤Þ¤¹¤«? (y/N) "
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢¤â¤¦¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "·Ù¹ð: ¥æ¡¼¥¶¡¼ID½ð̾¤¬¡¢%dÉÃ̤Íè¤Ç¤¹\n"
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (Â礭¤µ%ld) ¤Î¸°%s (uid %d) ¤Î¥Õ¥©¥ÈID¤È¤·¤Æɽ¼¨\n"
@@ -3800,7 +3576,7 @@
 "ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹¡£\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4055,7 +3831,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "ÈÖ¹æ(s)¡¢N)¼¡¡¢¤Þ¤¿¤ÏQ)Ãæ»ß¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ >"
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "̵¸ú¤Ê¸°¥µ¡¼¥Ð¡¼¡¦¥×¥í¥È¥³¥ë¤Ç¤¹ (us %d!=handler %d)\n"
@@ -4069,101 +3845,101 @@
 msgid "key not found on keyserver\n"
 msgstr "¸°¤¬¸°¥µ¡¼¥Ð¡¼¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "¸°%s¤ò%s¤«¤é¥µ¡¼¥Ð¡¼%s¤ËÍ×µá\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "¸°%s¤ò%s¤ËÍ×µá\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "¸°%s¤ò%s¥µ¡¼¥Ð¡¼%s¤ØÁ÷¿®\n"
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "¸°%s¤ò%s¤ØÁ÷¿®\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "¡È%s¡É¤ò%s¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "¡È%s¡É¤ò¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 msgid "no keyserver action!\n"
 msgstr "¸°¥µ¡¼¥Ð¡¼¡¦¥¢¥¯¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤»¤ó!\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "·Ù¹ð: ÊÌÈÇ (%s) ¤ÎGnuPG¤Î¸°¥µ¡¼¥Ð¡¼¡¦¥Ï¥ó¥É¥é\n"
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤ÏVERSION¤òÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "´ûÃΤθ°¥µ¡¼¥Ð¡¼¤¬¤¢¤ê¤Þ¤»¤ó (¥ª¥×¥·¥ç¥ó--keyserver¤ò»È¤¤¤Þ¤·¤ç¤¦)\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "¤³¤Î¹½ÃۤǤϡ¢³°Éô¸°¥µ¡¼¥Ð¡¼¤Î¸Æ½Ð¤·¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "¸°¥µ¡¼¥Ð¡¼¡¦¥¹¥­¡¼¥à¡Ö%s¡×ÍѤΥϥó¥É¥é¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "Áàºî¡Ö%s¡×¤Ï¡¢¸°¥µ¡¼¥Ð¡¼¡¦¥¹¥­¡¼¥à¡Ö%s¡×¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr "gpgkeys_%s¤Ï¡¢¥Ï¥ó¥É¥é%dÈǤò¥µ¥Ý¡¼¥È¤·¤Þ¤»¤ó\n"
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 msgid "keyserver timed out\n"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¥¿¥¤¥à¥¢¥¦¥È\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 msgid "keyserver internal error\n"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤ÎÆâÉô¥¨¥é¡¼\n"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "¸°¥µ¡¼¥Ð¡¼ÄÌ¿®¥¨¥é¡¼: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "¡È%s¡É¸°ID¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: ¤È¤Ð¤·¤Þ¤¹\n"
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "·Ù¹ð: ¸°%s¤ò%s·Ðͳ¤Ç²óÉü¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/keyserver.c:1600
+#: g10/keyserver.c:1607
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1Ëܤθ°¤ò%s¤«¤é²óÉü\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%dËܤθ°¤ò%s¤«¤é²óÉü\n"
@@ -4340,7 +4116,7 @@
 msgid "textmode"
 msgstr "¥Æ¥­¥¹¥È¥â¡¼¥É"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "̤ÃΤÎ"
 
@@ -4509,50 +4285,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "·¿%d¤Î²¼°Ì¥Ñ¥±¥Ã¥È¤Ë¥¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤òȯ¸«\n"
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "¤³¤Î¥»¥Ã¥·¥ç¥ó¤Çgpg-agent¤Ï̵¸ú¤Ç¤¹\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Î¥¯¥é¥¤¥¢¥ó¥Èpid¤òÀßÄê¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "¥¨¡¼¥¸¥§¥ó¥ÈÍѤΥµ¡¼¥Ð¡¼ÆɽФ·FD¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "¥¨¡¼¥¸¥§¥ó¥ÈÍѤΥµ¡¼¥Ð¡¼½ñ¹þ¤ßFD¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO´Ä¶­ÊÑ¿ô¤Î½ñ¼°¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent¥×¥í¥È¥³¥ë¡¦¥Ð¡¼¥¸¥ç¥ó%d¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: g10/passphrase.c:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "¡Ö%s¡×¤ØÀܳ¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent¤È¤ÎÄÌ¿®¾ã³²\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Ë¾ã³²: ¥¨¡¼¥¸¥§¥ó¥ÈÍøÍѶػß\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (¼ç¸°ID %s)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4563,40 +4339,40 @@
 "\"%.*s\"\n"
 "%u¥Ó¥Ã¥È%s¸°, ID %sºîÀ®ÆüÉÕ¤Ï%s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬Ä¹¤¹¤®¤Þ¤¹\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "¥¨¡¼¥¸¥§¥ó¥È¤«¤é¤Î̵¸ú¤Ê±þÅú\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "¥æ¡¼¥¶¡¼¤Ë¤è¤ë¼è¾Ã¤·\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Ë¾ã³²: ¥¨¡¼¥¸¥§¥ó¥È¤¬0x%lx¤òÊÖµÑ\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 msgid "can't query passphrase in batch mode\n"
 msgstr "¥Ð¥Ã¥Á¡¦¥â¡¼¥É¤Ç¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÏÌä¹ç¤»¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4605,17 +4381,17 @@
 "¼¡¤Î¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤Î¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë¤Ë¤Ï\n"
 "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹:¡È%s¡É\n"
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u¥Ó¥Ã¥È%s¸°, ID %sºîÀ®ÆüÉÕ¤Ï%s"
 
-#: g10/passphrase.c:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (¼ç¸°ID %s ¤ÎÉû¸°)"
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ: "
 
@@ -5452,12 +5228,12 @@
 msgstr ""
 "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£¡Ègpg --fix-trustdb¡É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "%dʸ»ú°Ê¾å¤ÎŤµ¤Î¥Æ¥­¥¹¥È¹Ô¤Ï¡¢¼è¤ê°·¤¨¤Þ¤»¤ó\n"
 
-#: g10/textfilter.c:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "ÆþÎϹԤÎŤµ¤¬%dʸ»ú¤òĶ¤¨¤Æ¤¤¤Þ¤¹\n"
@@ -5516,7 +5292,7 @@
 msgid "[ revoked]"
 msgstr "¼º¸ú"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "Ëþλ"
@@ -5526,102 +5302,102 @@
 msgid "[ unknown]"
 msgstr "̤ÃΤÎ"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 #, fuzzy
 msgid "[marginal]"
 msgstr "¤¢¤ëÄøÅÙ"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 #, fuzzy
 msgid "[ultimate]"
 msgstr "ÀäÂÐŪ"
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "̤ÄêµÁ"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "̵´ü¸Â"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "¤¢¤ëÄøÅÙ"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "´°Á´"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "ÀäÂÐŪ"
 
-#: g10/trustdb.c:574
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº¤Ï¡¢ÉÔÍפǤ¹\n"
 
-#: g10/trustdb.c:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "¼¡²ó¤Î¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¸¡ºº¤Ï¡¢%s¤Ç¤¹\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "¿®ÍÑ¥â¥Ç¥ë¡Ö%s¡×¤Ç¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº¤Ï¡¢ÉÔÍפǤ¹\n"
 
-#: g10/trustdb.c:604
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "¿®ÍÑ¥â¥Ç¥ë¡Ö%s¡×¤Ç¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¹¹¿·¤Ï¡¢ÉÔÍפǤ¹\n"
 
-#: g10/trustdb.c:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "¸ø³«¸°%s¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "--check-trustdb¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%dËܤθ°¤ò½èÍý (¤¦¤Á%dËܤÎÍ­¸úÀ­¿ô¤ò¥¯¥ê¥¢)\n"
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¸°%s¤Î¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: g10/trustdb.c:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "ºÇ¾®¤Î¡Ö¤¢¤ëÄøÅ٤ο®ÍÑ¡×%d¡¢ºÇ¾®¤Î¡ÖÁ´ÌÌŪ¿®ÍÑ¡×%d¡¢%s¿®ÍÑ¥â¥Ç¥ë\n"
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, 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:2147
+#: g10/trustdb.c:2148
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -5893,6 +5669,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "quit"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
@@ -5929,6 +5709,168 @@
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(¤³¤ÎÌÜŪ¤Ë¤Ï¸í¤Ã¤¿¥×¥í¥°¥é¥à¤ò»È¤Ã¤¿¤Î¤Ç¤·¤ç¤¦)\n"
 
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "admin"
+#~ msgstr "admin"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "list"
+#~ msgstr "list"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#~ msgid "name"
+#~ msgstr "name"
+
+#~ msgid "url"
+#~ msgstr "url"
+
+#~ msgid "fetch"
+#~ msgstr "fetch"
+
+#~ msgid "login"
+#~ msgstr "login"
+
+#~ msgid "lang"
+#~ msgstr "lang"
+
+#~ msgid "sex"
+#~ msgstr "sex"
+
+#~ msgid "cafpr"
+#~ msgstr "cafpr"
+
+#~ msgid "forcesig"
+#~ msgstr "forcesig"
+
+#~ msgid "generate"
+#~ msgstr "generate"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "save"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "key"
+
+#~ msgid "check"
+#~ msgstr "check"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "tsign"
+#~ msgstr "tsign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#~ msgid "addcardkey"
+#~ msgstr "addcardkey"
+
+#~ msgid "keytocard"
+#~ msgstr "keytocard"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "primary"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#~ msgid "keyserver"
+#~ msgstr "keyserver"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "Í×Ì󥢥르¥ê¥º¥à¡Ö%s¡×¤Ï¡¢¤³¤ÎÈǤÀ¤ÈÆɽФ·¤À¤±¤Ç¤¹\n"
 
Index: gnupg/po/pl.po
diff -u gnupg/po/pl.po:1.48 gnupg/po/pl.po:1.49
--- gnupg/po/pl.po:1.48	Fri Dec 10 23:20:43 2004
+++ gnupg/po/pl.po	Tue Dec 14 08:49:27 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <alex at bofh.net.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
@@ -40,7 +40,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -370,7 +370,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -583,165 +583,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "pominiêty: klucz prywatny jest ju¿ wpisany\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "wyj¶cie"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "wyj¶cie z tego menu"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "w"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "sprzeczne polecenia\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "pomoc"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "lista"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Klucz dostêpny w: "
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "¶ledzenia"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "w³kl"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lpodpis"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "zmiana daty wa¿no¶ci klucza"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmiana zaufania w³a¶ciciela"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "odc"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "unpod"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "b³±d ogólny"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "has³o"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujê klucz tajny w '%s'\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spróbuj \"help\")\n"
 
@@ -789,7 +712,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "has³o nie zosta³o poprawnie powtórzone; jeszcze jedna próba"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -799,13 +722,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia³a z tym poleceniem\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: 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:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1263,7 +1186,7 @@
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
@@ -1271,7 +1194,7 @@
 msgid "Hash: "
 msgstr "Skrótów: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Kompresji: "
 
@@ -1387,7 +1310,7 @@
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u¿ytku!\n"
@@ -1399,337 +1322,337 @@
 "modu³ szyfru ,,%s'' nie zosta³ za³adowany z powodu niebezpiecznych praw "
 "dostêpu\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie jest poprawn± nazw± zestawu znaków\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma³y URI serwera kluczy\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, 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/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE¯ENIE: program mo¿e stworzyæ plik zrzutu pamiêci!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE¯ENIE: %s powoduje obej¶cie %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u¿ywaæ %s z %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po³±czeniu z %s!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 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/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 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/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skrótów wiadomo¶ci jest niepoprawny\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skrótów po¶wiadczeñ jest niepoprawny\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto¶æ completes-needed musi byæ wiêksza od 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto¶æ marginals-needed musi byæ wiêksza od 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, 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/g10.c:2744
+#: g10/g10.c:2742
 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/g10.c:2746
+#: g10/g10.c:2744
 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/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mieæ warto¶æ 0, 1 lub 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "niew³a¶ciwe domy¶lne ustawienia\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "niew³a¶ciwe ustawienia szyfrów\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "niew³a¶ciwe ustawienia skrótów\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "niew³a¶ciwe ustawienia algorytmów kompresji\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia³a z %s!\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, 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/g10.c:2862
+#: g10/g10.c:2860
 #, 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/g10.c:2867
+#: g10/g10.c:2865
 #, 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/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod³o siê: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 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/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b³±d odszyfrowywania: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, 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/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, 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/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrsign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u¿ytkownika [polecenia]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbiór kluczy]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy³ka do serwera kluczy nie powiod³a siê: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbiór z serwera kluczy nie powiód³ siê: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powiód³ siê: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod³o siê: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od¶wie¿enie kluczy z serwera nie powiod³o siê: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdjêcie opakowania ASCII nie powiod³o siê: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod³o siê: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew³a¶ciwy algorytm skrótu ,%s'\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj± wiadomo¶æ ...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1737,23 +1660,23 @@
 "nazwa adnotacji mo¿e zawieraæ tylko litery, cyfry, kropki i podkre¶lenia, \n"
 "i musi koñczyæ siê ,,=''\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "adnotacja u¿ytkownika musi zawieraæ znak '@'\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "tre¶æ adnotacji nie mo¿e zawieraæ znaków steruj±cych\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po¶wiadczania jest niepoprawny\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
@@ -2617,12 +2540,12 @@
 msgstr "Identyfikator u¿ytkownika ,,%s'' zosta³ uniewa¿niony."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisaæ? (t/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr " Nie da siê z³o¿yæ podpisu.\n"
 
@@ -2823,7 +2746,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisaæ? (t/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2876,18 +2799,10 @@
 msgstr "przenoszê podpis klucza na w³a¶ciwe miejsce\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "zapis"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "zapis zmian i wyj¶cie"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "odc"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "okazanie odcisku klucza"
 
@@ -2896,506 +2811,358 @@
 msgstr "lista kluczy i identyfikatorów u¿ytkowników"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "id"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "wybór identyfikatora u¿ytkownika N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "klucz"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "wybór podklucza N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "lista"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "lista podpisów"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "l"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "podpis"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "z³o¿enie podpisu na kluczu"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "p"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "podpis"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "z³o¿enie podpisu oddzielonego od dokumentu"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lpodpis"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "z³o¿enie prywatnego (lokalnego) podpisu na kluczu"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nupodpis"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "z³o¿enie na kluczu podpisu nie podlegaj±cego uniewa¿nieniu"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nulpodpis"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "z³o¿enie na kluczu prywatnego podpisu nie podlegaj±cego uniewa¿nieniu"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "dodid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u¿ytkownika do klucza"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "dodfoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "dodanie zdjêcia u¿ytkownika do klucza"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "usid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "usuniêcie identyfikatora u¿ytkownika z klucza"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "usfoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "dodkl"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "dodkl"
-
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1272
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
-#, fuzzy
-msgid "keytocard"
-msgstr "Podaj \"help\" aby zobaczyæ listê poleceñ."
-
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "uskl"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "usuniêcie podklucza"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "dodun"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "wyznaczenie klucza uniewa¿niaj±cego"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "uspod"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "usuniêcie podpisów"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "data"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "zmiana daty wa¿no¶ci klucza"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "g³ówny"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "oznaczenie identyfikatora u¿ytkownika jako g³ównego"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "prze³"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "prze³±czenie pomiêdzy list± kluczy publicznych i prywatnych"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "p"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "opcje"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "opcje"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawieñ"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "ustaw"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "ustawienie opcji klucza"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "aktopc"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "aktualizacja ustawieñ klucza"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "b³±d serwera kluczy"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "niezrozuma³y URI serwera kluczy\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "zmiana has³a klucza"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "zaufanie"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w³a¶ciciela"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "unpod"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "uniewa¿nienie podpisu"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "unpod"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "uniewa¿nienie identyfikatora u¿ytkownika"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "unpkl"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "uniewa¿nienie podklucza"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "wy³kl"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "wy³±czyæ klucz z u¿ycia"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "w³kl"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "w³±czyæ klucz do u¿ycia"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "foto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "okazanie identyfikatora - zdjêcia"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "b³±d odczytu bloku klucza tajnego '%s': %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Dostêpny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u¿yæ polecenia \"prze³\".\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "Klucz uniewa¿niony."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Podpisaæ wszystkie identyfikatory u¿ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied¼: wybierz identyfikatory u¿ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, 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:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybraæ co najmniej jeden identyfikator u¿ytkownika.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo¿esz usun±æ ostatniego identyfikatora u¿ytkownika!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Czy na pewno usun±æ wszystkie wybrane identyfikatory u¿ytkownika? "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Czy na pewno usun±æ ten identyfikator u¿ytkownika? "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Czy na pewno usun±æ ten identyfikator u¿ytkownika? "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Musisz wybraæ co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybraæ co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Czy na pewno chcesz usun±æ wybrane klucze? "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Czy na pewno chcesz usun±æ ten klucz? "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Czy na pewno uniewa¿niæ wszystkie wybrane identyfikatory u¿ytkownika? "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Czy na pewno uniewa¿niæ ten identyfikator u¿ytkownika? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Czy na pewno chcesz uniewa¿niæ wybrane klucze? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Czy na pewno chcesz uniewa¿niæ ten klucz? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ustawienie opcji klucza"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, 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:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Czy na pewno usaktualniæ ustawienia? "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Zapisaæ zmiany? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Wyj¶æ bez zapisania zmian? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powiód³ siê: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powiód³ siê: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 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:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Skrót: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, 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:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (poufne)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "nie mo¿na utworzyæ %s: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[uniewa¿niony]"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta³ wy³±czony z u¿ytku"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 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:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3403,19 +3170,19 @@
 "Pokazana warto¶æ wiarygodno¶ci klucza mo¿e byæ niepoprawna,\n"
 "dopóki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "[uniewa¿niony]"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "data"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3424,7 +3191,7 @@
 "             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:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3433,45 +3200,45 @@
 "OSTRZE¯ENIE: To jest klucz PGP wersji 2. Dodanie zdjêcia spowoduje, ¿e\n"
 "             niektóre wersje przestan± go rozumieæ.\n"
 
-#: g10/keyedit.c:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je dodaæ? (t/N) "
 
-#: g10/keyedit.c:2607
+#: g10/keyedit.c:2608
 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:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun±æ ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun±æ ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun±æ ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun±æ ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuniêty.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpisów usuniêtych.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta³o usuniête.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3481,162 +3248,162 @@
 "             uniewa¿niaj±cego, spowoduje, ¿e niektóre wersje PGP przestan±\n"
 "             go rozumieæ.\n"
 
-#: g10/keyedit.c:2885
+#: g10/keyedit.c:2886
 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:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa¿niaj±cego: "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 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:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 #, 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:2984
+#: g10/keyedit.c:2985
 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:2990
+#: g10/keyedit.c:2991
 #, 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:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Proszê usun±æ znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Proszê wybraæ tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Zmiana daty wa¿no¶ci podklucza.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa¿no¶ci g³ównego klucza.\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj±cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Proszê wybraæ dok³adnie jeden identyfikator u¿ytkownika.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, 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:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, 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:3496
+#: g10/keyedit.c:3497
 #, 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:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u¿ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o numerze %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Identyfikator u¿ytkownika: "
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, 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:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa¿no¶æ tego klucza wygas³a %s.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa¿niæ? (t/N) "
 
-#: g10/keyedit.c:3738
+#: g10/keyedit.c:3739
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzyæ certyfikat uniewa¿nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:3765
+#: g10/keyedit.c:3766
 #, 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:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa¿niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa¿niæ te podpisy:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzyæ certyfikaty uniewa¿nienia ? (t/N) "
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u¿ytkownika ,,%s'' zosta³ ju¿ uniewa¿niony\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, 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:4126
+#: g10/keyedit.c:4127
 #, 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"
@@ -3967,7 +3734,7 @@
 msgstr ""
 "Musisz podaæ d³ugie, skomplikowane has³o aby ochroniæ swój klucz tajny.\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4234,7 +4001,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
@@ -4249,106 +4016,106 @@
 msgid "key not found on keyserver\n"
 msgstr "klucz ,,%s'' nie zosta³ odnaleziony: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "brak znanyk serwerów kluczy (u¿yj opcji --keyserver)\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "b³±d serwera kluczy"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "b³±d serwera kluczy"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "odbiór z serwera kluczy nie powiód³ siê: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, 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:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
@@ -4526,7 +4293,7 @@
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "nieznany"
 
@@ -4700,50 +4467,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie jest dostêpny w tej sesji\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "nie mo¿na ustawiæ numeru procesu klienckiego agenta\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "serwer nie chce czytaæ deskryptora dla agenta\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "serwer nie chce pisaæ deskryptora dla agenta\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z³y format zmiennej ¶rodowiskowej GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, 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:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo¿na siê po³±czyæ z ,,%s'': %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "problem z porozumiewaniem siê z agentem\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem z agentem - zostaje wy³±czony\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (podklucz %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4754,41 +4521,41 @@
 "\"%.*s\".\n"
 "Klucz o d³ugo¶ci %u bitów, typ %s, numer %08lX, stworzony %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Powtórzone has³o\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Has³o\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "has³o zbyt d³ugie\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "b³êdna odpowied¼ agenta\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "anulowano przez u¿ytkownika\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem agenta: zwróci³ 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, 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:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Podaj has³o: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4798,17 +4565,17 @@
 "Musisz podaæ has³o aby odbezpieczyæ klucz prywatny u¿ytkownika:\n"
 "\""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, 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:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Powtórz has³o: "
 
@@ -5702,12 +5469,12 @@
 msgstr ""
 "Baza zaufania jest uszkodzona; proszê uruchomiæ ,,gpg --fix-trustdb''.\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linia d³u¿sza ni¿ %d znaków\n"
@@ -5767,7 +5534,7 @@
 msgid "[ revoked]"
 msgstr "[uniewa¿niony]"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[przeterminowany]"
@@ -5777,101 +5544,101 @@
 msgid "[ unknown]"
 msgstr "nieznany"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "nigdy     "
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nastêpne sprawdzanie bazy odbêdzie siê %s\n"
 
-#: g10/trustdb.c:589
+#: 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:604
+#: 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:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "klucz publiczny %08lX nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "nale¿y uruchomiæ gpg z opcj± ,,--check-trustdb''\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "przetworzono %d kluczy (rozwi±zano %d przeliczeñ zaufania)\n"
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "brak absolutnie zaufanych kluczy\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, 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:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, 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"
@@ -6143,6 +5910,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "wyj¶cie"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "wW"
@@ -6180,6 +5951,162 @@
 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 "q"
+#~ msgstr "w"
+
+#~ msgid "help"
+#~ msgstr "pomoc"
+
+#~ msgid "list"
+#~ msgstr "lista"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "¶ledzenia"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "w³kl"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lpodpis"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "odc"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "unpod"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "b³±d ogólny"
+
+#~ msgid "passwd"
+#~ msgstr "has³o"
+
+#~ msgid "save"
+#~ msgstr "zapis"
+
+#~ msgid "fpr"
+#~ msgstr "odc"
+
+#~ msgid "uid"
+#~ msgstr "id"
+
+#~ msgid "key"
+#~ msgstr "klucz"
+
+#~ msgid "check"
+#~ msgstr "lista"
+
+#~ msgid "c"
+#~ msgstr "l"
+
+#~ msgid "sign"
+#~ msgstr "podpis"
+
+#~ msgid "s"
+#~ msgstr "p"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "podpis"
+
+#~ msgid "lsign"
+#~ msgstr "lpodpis"
+
+#~ msgid "nrsign"
+#~ msgstr "nupodpis"
+
+#~ msgid "nrlsign"
+#~ msgstr "nulpodpis"
+
+#~ msgid "adduid"
+#~ msgstr "dodid"
+
+#~ msgid "addphoto"
+#~ msgstr "dodfoto"
+
+#~ msgid "deluid"
+#~ msgstr "usid"
+
+#~ msgid "delphoto"
+#~ msgstr "usfoto"
+
+#~ msgid "addkey"
+#~ msgstr "dodkl"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "dodkl"
+
+#, fuzzy
+#~ msgid "keytocard"
+#~ msgstr "Podaj \"help\" aby zobaczyæ listê poleceñ."
+
+#~ msgid "delkey"
+#~ msgstr "uskl"
+
+#~ msgid "addrevoker"
+#~ msgstr "dodun"
+
+#~ msgid "delsig"
+#~ msgstr "uspod"
+
+#~ msgid "expire"
+#~ msgstr "data"
+
+#~ msgid "primary"
+#~ msgstr "g³ówny"
+
+#~ msgid "toggle"
+#~ msgstr "prze³"
+
+#~ msgid "t"
+#~ msgstr "p"
+
+#~ msgid "pref"
+#~ msgstr "opcje"
+
+#~ msgid "showpref"
+#~ msgstr "opcje"
+
+#~ msgid "setpref"
+#~ msgstr "ustaw"
+
+#~ msgid "updpref"
+#~ msgstr "aktopc"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "b³±d serwera kluczy"
+
+#~ msgid "trust"
+#~ msgstr "zaufanie"
+
+#~ msgid "revsig"
+#~ msgstr "unpod"
+
+#~ msgid "revuid"
+#~ msgstr "unpod"
+
+#~ msgid "revkey"
+#~ msgstr "unpkl"
+
+#~ msgid "disable"
+#~ msgstr "wy³kl"
+
+#~ msgid "enable"
+#~ msgstr "w³kl"
+
+#~ msgid "showphoto"
+#~ msgstr "foto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "w tej wersji algorytm skrótu ,,%s'' jest tylko do odczytu\n"
 
Index: gnupg/po/pt.po
diff -u gnupg/po/pt.po:1.13 gnupg/po/pt.po:1.14
--- gnupg/po/pt.po:1.13	Fri Dec 10 23:20:43 2004
+++ gnupg/po/pt.po	Tue Dec 14 08:49:27 2004
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <morais at kde.org>\n"
 "Language-Team: pt <morais at kde.org>\n"
@@ -33,7 +33,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -354,7 +354,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -565,165 +565,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta já está presente\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "sair"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "q"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "help"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "list"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda disponível"
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "debug"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "enable"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsign"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confiança"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impressão digital"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "erro geral"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inválido (tente \"help\")\n"
 
@@ -768,7 +691,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -778,13 +701,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output não funciona para este comando\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: 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:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1246,7 +1169,7 @@
 msgid "Pubkey: "
 msgstr "Chave pública: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "Cifra: "
 
@@ -1254,7 +1177,7 @@
 msgid "Hash: "
 msgstr "Dispersão: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Compressão: "
 
@@ -1358,7 +1281,7 @@
 msgid "reading options from `%s'\n"
 msgstr "a ler opções de `%s'\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s não é para uso normal!\n"
@@ -1370,337 +1293,337 @@
 "a extensão de cifra \"%s\" não foi carregada devido às suas permissões "
 "inseguras\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "não consegui processar a URI do servidor de chaves\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opções de importação inválidas\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opções de importação inválidas\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, 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/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrepõe %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 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/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 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/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado é inválido\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado é inválido\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado é inválido\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certificação selecionado é inválido\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, 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/g10.c:2744
+#: g10/g10.c:2742
 #, 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/g10.c:2746
+#: g10/g10.c:2744
 #, 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/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) não é recomendável\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "preferências por omissão inválidas\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "preferências pessoais de cifra inválidas\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "preferências pessoais de 'digest' inválidas\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "preferências pessoais de compressão inválidas\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, 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/g10.c:2862
+#: g10/g10.c:2860
 #, 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/g10.c:2867
+#: g10/g10.c:2865
 #, 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/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 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/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, 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/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, 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/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-utilizador"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-utilizador"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1708,23 +1631,23 @@
 "um nome de notação deve ter apenas caracteres imprimíveis ou espaços, e "
 "terminar com um '='\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "um valor de notação de utilizador não deve conter o caracter '@'\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de notação não deve usar caracteres de controle\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de política de certificação dada é inválida\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de política de assinatura dada é inválida\n"
@@ -2592,12 +2515,12 @@
 msgstr "Utilizador \"%s\" está revocado."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  Não foi possível assinar.\n"
 
@@ -2799,7 +2722,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2852,18 +2775,10 @@
 msgstr "a mover a assinatura da chave para o local correcto\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "save"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "gravar e sair"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "mostra impressão digital"
 
@@ -2872,505 +2787,358 @@
 msgstr "lista chave e identificadores de utilizadores"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "key"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "seleciona chave secundária N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "check"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "sign"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "fazer uma assinatura separada"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "assina a chave de forma não-revogável"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "assinar a chave localmente e de forma não revogável"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotográfico"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "adiciona nova chave secundária"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "remove uma chave secundária"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "adiciona uma chave de revocação"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primary"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "seleccionar o identificador do utilizador como primário"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e pública"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "lista preferências (perito)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "lista preferências (detalhadamente)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "configurar lista de preferências"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "preferências actualizadas"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "erro do servidor de chaves"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "não consegui processar a URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "muda os valores de confiança"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "revocar um ID de utilizador"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secundária"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "mostrar identificador fotográfico"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, 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:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Chave secreta disponível.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta é necessária para fazer isto.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "A chave está revogada."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestão: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, 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:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "Você precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 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:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Você deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Você deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Você quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Você quer realmente remover esta chave? "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente revocar este ID de utilizador? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Você quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Você quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "configurar lista de preferências"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, 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:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente actualizar as preferências?"
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gravar alterações? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave não alterada, nenhuma actualização é necessária.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Características: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, 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:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensível)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossível criar %s: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 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:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3378,25 +3146,25 @@
 "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:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3405,46 +3173,46 @@
 "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:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 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:2607
+#: g10/keyedit.c:2608
 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:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura válida? (s/N/q)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inválida? (s/N/q)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3453,161 +3221,161 @@
 "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:2885
+#: g10/keyedit.c:2886
 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:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 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:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 #, 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:2984
+#: g10/keyedit.c:2985
 #, 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:2990
+#: g10/keyedit.c:2991
 #, 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:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selecções das chaves secretas.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor seleccione no máximo uma chave secundária.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "A modificar a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, 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:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, 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:3496
+#: g10/keyedit.c:3497
 #, 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:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secundária com índice %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, 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:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr "  (não-exportável)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 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:3738
+#: g10/keyedit.c:3739
 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:3765
+#: g10/keyedit.c:3766
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (não-exportável)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revogação? (s/N) "
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, 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:4126
+#: g10/keyedit.c:4127
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3939,7 +3707,7 @@
 "Você precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4201,7 +3969,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opções de exportação inválidas\n"
@@ -4216,106 +3984,106 @@
 msgid "key not found on keyserver\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, 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:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, 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:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, 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:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
@@ -4495,7 +4263,7 @@
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 #, fuzzy
 msgid "unknown"
 msgstr "versão desconhecida"
@@ -4671,50 +4439,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 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:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "não consegui colocar o pid do cliente no agente\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "não consigo obter FD de leitura no servidor para o agente\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "não consigo obter FD de escrita no servidor para o agente\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variável de ambiente GPG_AGENT_INFO inválida\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, 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:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossível ligar a `%s': %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "problemas na comunicação com o gpg-agent\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema com o agente - a desactivar a utilização deste\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4727,41 +4495,41 @@
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Insira a frase secreta\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "resposta do agente inválida\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "impossível pedir senha em modo não-interactivo\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4771,17 +4539,17 @@
 "Você precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, 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:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -5662,12 +5430,12 @@
 "A base de dados de confiança está danificada; por favor execute\n"
 "\"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
@@ -5728,7 +5496,7 @@
 msgid "[ revoked]"
 msgstr "revkey"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "expire"
@@ -5738,103 +5506,103 @@
 msgid "[ unknown]"
 msgstr "versão desconhecida"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: 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:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, 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:589
+#: 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:604
+#: 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:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave pública %08lX não encontrada: %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confiança\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 #, 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:1963
+#: g10/trustdb.c:1964
 #, 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:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, 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"
@@ -6107,6 +5875,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "sair"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
@@ -6144,6 +5916,158 @@
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(você pode ter usado o programa errado para esta tarefa)\n"
 
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "list"
+#~ msgstr "list"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsign"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fpr"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "erro geral"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "save"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "key"
+
+#~ msgid "check"
+#~ msgstr "check"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "sign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "addkey"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "primary"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "erro do servidor de chaves"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid ""
 #~ "About to generate a new %s keypair.\n"
 #~ "              minimum keysize is  768 bits\n"
Index: gnupg/po/pt_BR.po
diff -u gnupg/po/pt_BR.po:1.50 gnupg/po/pt_BR.po:1.51
--- gnupg/po/pt_BR.po:1.50	Fri Dec 10 23:20:43 2004
+++ gnupg/po/pt_BR.po	Tue Dec 14 08:49:27 2004
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -37,7 +37,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -359,7 +359,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -571,167 +571,89 @@
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta já está presente\n"
 
-# INICIO MENU
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "sair"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "q"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "help"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "list"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda disponível"
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "debug"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "enable"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsign"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confiança"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impressão digital"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "erro geral"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inválido (tente \"help\")\n"
 
@@ -779,7 +701,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "A frase secreta não foi repetida corretamente; tente outra vez.\n"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -789,13 +711,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: 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:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -1257,7 +1179,7 @@
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr ""
 
@@ -1265,7 +1187,7 @@
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 #, fuzzy
 msgid "Compression: "
 msgstr "Comentário: "
@@ -1370,7 +1292,7 @@
 msgid "reading options from `%s'\n"
 msgstr "lendo opções de `%s'\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s não é para uso normal!\n"
@@ -1380,346 +1302,346 @@
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossível escrever para o chaveiro: %s\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' é um arquivo vazio\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inválido"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' é um arquivo vazio\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inválida"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' é um arquivo vazio\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inválido"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' é um arquivo vazio\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inválida"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' é um arquivo vazio\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inválido"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2616
+#: g10/g10.c:2614
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2622
+#: g10/g10.c:2620
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2635
+#: g10/g10.c:2633
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado não é válido\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado não é válido\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado não é válido\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado não é válido\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, 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/g10.c:2744
+#: g10/g10.c:2742
 #, 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/g10.c:2746
+#: g10/g10.c:2744
 #, 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/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) não é recomendável\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista preferências"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista preferências"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista preferências"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista preferências"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2862
+#: g10/g10.c:2860
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2867
+#: g10/g10.c:2865
 #, 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/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3093
+#: g10/g10.c:3091
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuário"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuário"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key id-usuário"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key id-usuário"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuário [comandos]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuário] [chaveiro]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumeração de chaves secretas falhou: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumeração de chaves secretas falhou: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas não fica claro
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inválido `%s'\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Vá em frente e digite sua mensagem ...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1728,26 +1650,26 @@
 "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "um valor de notação não deve usar caracteres de controle\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de notação não deve usar caracteres de controle\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de política dada é inválida\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de política dada é inválida\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de política dada é inválida\n"
@@ -2561,13 +2483,13 @@
 msgstr "A chave é protegida.\n"
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 #, 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -2748,7 +2670,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2803,18 +2725,10 @@
 msgstr "movendo a assinatura da chave para o local correto\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "save"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "gravar e sair"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "mostra impressão digital"
 
@@ -2823,753 +2737,599 @@
 msgstr "lista chave e identificadores de usuários"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "seleciona ID de usuário N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "key"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "seleciona chave secundária N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "check"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "sign"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "fazer uma assinatura separada"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
 #: g10/keyedit.c:1261
 #, fuzzy
-msgid "nrsign"
-msgstr "sign"
-
-#: g10/keyedit.c:1261
-#, fuzzy
 msgid "sign the key non-revocably"
 msgstr "assina a chave localmente"
 
 #: g10/keyedit.c:1262
 #, fuzzy
-msgid "nrlsign"
-msgstr "sign"
-
-#: g10/keyedit.c:1262
-#, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usuário"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr ""
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usuário"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "remove ID de usuário"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr ""
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "adiciona nova chave secundária"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "remove uma chave secundária"
 
-#: g10/keyedit.c:1275
-#, fuzzy
-msgid "addrevoker"
-msgstr "revkey"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 #, fuzzy
 msgid "add a revocation key"
 msgstr "adiciona nova chave secundária"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr ""
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e pública"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista preferências"
 
-#: g10/keyedit.c:1283
-#, fuzzy
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista preferências"
 
-#: g10/keyedit.c:1284
-#, fuzzy
-msgid "setpref"
-msgstr "pref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 #, fuzzy
 msgid "set preference list"
 msgstr "lista preferências"
 
-#: g10/keyedit.c:1285
-#, fuzzy
-msgid "updpref"
-msgstr "pref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 #, fuzzy
 msgid "updated preferences"
 msgstr "lista preferências"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "erro geral"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 msgid "set preferred keyserver URL"
 msgstr ""
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "muda os valores de confiança"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1290
-#, fuzzy
-msgid "revuid"
-msgstr "revsig"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 #, fuzzy
 msgid "revoke a user ID"
 msgstr "adiciona um novo ID de usuário"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secundária"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr ""
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Chave secreta disponível.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta é necessária para fazer isto.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave é protegida.\n"
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de usuário? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestão: Selecione os IDs de usuário para assinar\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 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:1551
+#: g10/keyedit.c:1552
 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:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usuário selecionados? "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de usuário? "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de usuário? "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Você deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Você deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Você realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Você realmente quer remover esta chave? "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usuário selecionados? "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente remover este ID de usuário? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Você realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Você realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "lista preferências"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, 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:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente gerar os certificados de revogação? (s/N)"
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvar alterações? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualização falhou: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualização da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave não alterada, nenhuma atualização é necessária.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, 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:2251
+#: g10/keyedit.c:2252
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossível criar %s: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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:2596
+#: g10/keyedit.c:2597
 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:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 #, 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:2607
+#: g10/keyedit.c:2608
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura válida? (s/N/q)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inválida? (s/N/q)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 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:2885
+#: g10/keyedit.c:2886
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2905
+#: g10/keyedit.c:2906
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2943
+#: g10/keyedit.c:2944
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2965
+#: g10/keyedit.c:2966
 #, 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:2984
+#: g10/keyedit.c:2985
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:2990
+#: g10/keyedit.c:2991
 #, 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:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as seleções das chaves secretas.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no máximo uma chave secundária.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Modificando a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Você precisa selecionar pelo menos um ID de usuário.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inválida\n"
 
-#: g10/keyedit.c:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, 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:3496
+#: g10/keyedit.c:3497
 #, 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:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usuário com índice %d\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secundária com índice %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuário: \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave não é protegida.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 #, 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:3738
+#: g10/keyedit.c:3739
 #, 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:3765
+#: g10/keyedit.c:3766
 #, 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:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Você está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revogação? (s/N)"
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave é protegida.\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3905,7 +3665,7 @@
 "Você precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr ""
@@ -4175,7 +3935,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "chaveiro inválido"
@@ -4190,106 +3950,106 @@
 msgid "key not found on keyserver\n"
 msgstr "usuário `%s' não encontrado: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "impossível escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "impossível escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "lendo opções de `%s'\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "chaveiro inválido"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "enumeração de chaves secretas falhou: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, 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:1578
+#: g10/keyserver.c:1585
 #, 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:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "impossível escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "impossível escrever para o chaveiro: %s\n"
@@ -4470,7 +4230,7 @@
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 #, fuzzy
 msgid "unknown"
 msgstr "versão desconhecida"
@@ -4644,50 +4404,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, 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:565
+#: g10/passphrase.c:568
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4699,44 +4459,44 @@
 "usuário: \"%.*s\"\n"
 "%u-bit %s chave, ID %08lX, criada %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 #, fuzzy
 msgid "passphrase too long\n"
 msgstr "linha muito longa\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "impossível pedir senha em modo não-interativo\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4746,17 +4506,17 @@
 "Você precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usuário: \""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, 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:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -5632,12 +5392,12 @@
 "O banco de dados de confiabilidade está danificado; por favor rode\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
@@ -5697,7 +5457,7 @@
 msgid "[ revoked]"
 msgstr "revkey"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "expire"
@@ -5707,103 +5467,103 @@
 msgid "[ unknown]"
 msgstr "versão desconhecida"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: 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:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, 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:589
+#: 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:604
+#: 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:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave pública não encontrada"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "muda os valores de confiança"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, 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:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, 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"
@@ -6079,6 +5839,11 @@
 msgid "nN"
 msgstr "nN"
 
+# INICIO MENU
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "sair"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
@@ -6117,6 +5882,153 @@
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(você pode ter usado o programa errado para esta tarefa)\n"
 
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "list"
+#~ msgstr "list"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsign"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fpr"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "erro geral"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "save"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "key"
+
+#~ msgid "check"
+#~ msgstr "check"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "sign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#, fuzzy
+#~ msgid "nrsign"
+#~ msgstr "sign"
+
+#, fuzzy
+#~ msgid "nrlsign"
+#~ msgstr "sign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "addkey"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#, fuzzy
+#~ msgid "addrevoker"
+#~ msgstr "revkey"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#, fuzzy
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#, fuzzy
+#~ msgid "setpref"
+#~ msgstr "pref"
+
+#, fuzzy
+#~ msgid "updpref"
+#~ msgstr "pref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "erro geral"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "revuid"
+#~ msgstr "revsig"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
 #~ msgid ""
 #~ "About to generate a new %s keypair.\n"
 #~ "              minimum keysize is  768 bits\n"
Index: gnupg/po/ro.po
diff -u gnupg/po/ro.po:1.8 gnupg/po/ro.po:1.9
--- gnupg/po/ro.po:1.8	Fri Dec 10 23:20:42 2004
+++ gnupg/po/ro.po	Tue Dec 14 08:49:27 2004
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2004-06-17 12:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <lbgnupg at rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro at lists.sourceforge.net>\n"
@@ -34,7 +34,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -361,7 +361,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -572,165 +572,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "sãritã: cheia secretã deja prezentã\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "terminã"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "ieºi din acest meniu"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "t"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "comenzi în conflict\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "ajutor"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "afiºeazã acest mesaj"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "enumerã"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Cheie disponibilã la: "
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "depanare"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "activ"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "semloc"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "schimbã data de expirare"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "schimbã încrederea pentru proprietar"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "ampr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "afiºeazã amprenta"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsem"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "eroare generalã"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereazã o nouã perechi de chei"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "parola"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Comandã> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comenzi în conflict\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comenzi în conflict\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "scriu cheia secretã în `%s'\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comandã invalidã  (încercaþi \"ajutor\")\n"
 
@@ -775,7 +698,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "fraza-parolã nu a fost repetatã corect; mai încercaþi o datã"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -785,13 +708,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceastã comandã\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia `%s' nu a fost gãsitã: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1251,7 +1174,7 @@
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "Cifru: "
 
@@ -1259,7 +1182,7 @@
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Compresie: "
 
@@ -1375,7 +1298,7 @@
 msgid "reading options from `%s'\n"
 msgstr "citesc opþiuni din `%s'\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTÃ: %s nu este pentru o folosire normalã!\n"
@@ -1387,341 +1310,341 @@
 "extensie cifru \"%s\" nu a fost încãrcat din cauza permisiunilor nesigure "
 "(unsafe)\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nu este un set de carectere valid\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URI pentru serverul de chei\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opþiuni export invalide\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opþiuni export invalide\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opþiuni import invalide\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "opþiuni import invalide\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opþiuni export invalide\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "opþiuni export invalide\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opþiuni import invalide\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opþiuni import invalide\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opþiuni export invalide\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opþiuni export invalide\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execuþie ca %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fiºier core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s înlocuieºte %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 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/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 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/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie sã fie mai mare decât 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie sã fie mai mare decât 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth trebuie sã fie în intervalul 1..255\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2742
 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/g10.c:2746
+#: g10/g10.c:2744
 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/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTÃ: modul S2K simplu (0) este contraindicat cu insistenþã\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie sã fie 0, 1 sau 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "preferinþe implicite invalide\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "preferinþe cifrare personale invalide\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "preferinþe rezumat personale invalide\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "preferinþe compresie personale invalide\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge încã cu %s!\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, fuzzy, 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/g10.c:2862
+#: g10/g10.c:2860
 #, fuzzy, 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/g10.c:2867
+#: g10/g10.c:2865
 #, fuzzy, 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/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am eºuat sã iniþializez TrustDB:%s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 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/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [nume_fiºier]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fiºier]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decriptarea a eºuat: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fiºier]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fiºier]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nu puteþi folosi %s câtã vreme în modul %s\n"
 
-#: g10/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [nume_fiºier]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fiºier]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fiºier]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nu puteþi folosi %s câtã vreme în modul %s\n"
 
-#: g10/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fiºier]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fiºier]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fiºier]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-utilizator"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-utilizator"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei eºuatã: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepþie server de chei eºuatã: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie eºuat: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "cãutare server de chei eºuatã: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei eºuatã: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a eºuat: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a eºuat: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[nume_fiºier]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Daþi-i drumul ºi scrieþi mesajul ...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1729,24 +1652,24 @@
 "un nume de notaþie trebuie sã conþinã numai caractere imprimabile sau spaþii "
 "ºi sã se termine cu un '='\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nume de notaþie utilizator trebuie sã conþinã caracterul '@'\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 "o valoare de notaþie trebuie sã nu foloseascã nici un caracter de control\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semnãturi furnizat este invalid\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul politicii de semnãturi furnizat este invalid\n"
@@ -2615,12 +2538,12 @@
 msgstr "ID utilizator \"%s\" a fost revocat."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  Nu pot semna.\n"
 
@@ -2824,7 +2747,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Doriþi cu adevãrat sã semnaþi?"
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2877,18 +2800,10 @@
 msgstr "mut o semnãturã de cheie în locul corect\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "salveazã"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "salveazã ºi terminã"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "ampr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "afiºeazã amprenta"
 
@@ -2897,506 +2812,359 @@
 msgstr "enumerã chei ºi ID-uri utilizator"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "selecteazã ID utilizator N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "cheie"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "selecteazã cheie secundarã N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "verificã"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "enumerã semnãturi"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "semneazã"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "semneazã cheia"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "semneazã"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "creazã o semnãturã detaºatã"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "semloc"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "semneazã cheia local"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "semirev"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "semneazã cheia irevocabil"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "semlirev"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "semneazã cheia local ºi irevocabil"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adauid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "adaugã un ID utilizator"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "adapoza"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "adaugã o pozã ID"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "steuid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "ºterge ID utilizator"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "stepoza"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "adacheie"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "adaugã o cheie secundarã"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "adacheie"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "stecheie"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "ºterge o cheie secundarã"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "adarev"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "adaugã o cheie de revocare"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "stesem"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "ºterge semnãturi"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expira"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "schimbã data de expirare"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primar"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "marcheazã ID-ul utilizator ca primar"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "comuta"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "comutã între listele de chei secrete ºi publice"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "enumerã preferinþele (expert)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "afispref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "afiºeazã preferinþele (detaliat)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "seteazã lista de preferinþe"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "actpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "preferinþe actualizate"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "eroare server de chei"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "nu am putut interpreta URI pentru serverul de chei\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "schimbã fraza-parolã"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "incred"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "schimbã încrederea pentru proprietar"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsem"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "revocã semnãturi"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "revocã un ID utilizator"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revcheie"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "revocã o cheie secundarã"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "deact"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "deactiveazã o cheie"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "activ"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "activeazã o cheie"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "afispoza"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "aratã o pozã ID"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eroare la citire keyblock secret `%s': %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Cheia secretã este disponibilã.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Aveþi nevoie de cheia secretã pentru a face aceasta.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Vã rugãm folosiþi mai întâi comanda \"toggle\".\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "Cheia este revocatã."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Semnaþi într-adevãr toate ID-urile utilizator? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestie: Selectaþi ID-ul utilizator de semnat\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, 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:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 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:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "Nu puteþi ºterge ultimul ID utilizator!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "ªtergeþi într-adevãr toate ID-urile utilizator selectate? "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "ªtergeþi într-adevãr acest ID utilizator? "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "ªtergeþi într-adevãr acest ID utilizator? "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Trebuie sã selectaþi cel puþin o cheie.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Trebuie sã selectaþi cel puþin o cheie.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Doriþi într-adevãr sã ºtergeþi cheile selectate? "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Doriþi într-adevãr sã ºtergeþi aceastã cheie? "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Doriþi într-adevãr sã revocaþi toate ID-urile utilizator selectate? "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Doriþi într-adevãr sã revocaþi acest ID utilizator? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Doriþi într-adevãr sã revocaþi cheile selectate? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Doriþi într-adevãr sã revocaþi aceastã cheie? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "seteazã lista de preferinþe"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, fuzzy
 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? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Doriþi într-adevãr sã actualizaþi preferinþele? "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvaþi schimbãrile? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Terminaþi fãrã a salva? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a eºuat: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizarea secretului a eºuat: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 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:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Capabilitãþi: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aceastã cheie poate fi revocatã de cheia %s "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "nu pot crea %s: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocatã] "
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [expirã: %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [expirã: %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " încredere: %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " încredere: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Aceastã cheie a fost deactivatã"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 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:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3404,19 +3172,19 @@
 "Vã rugãm observaþi cã validitatea cheii arãtate nu este în mod necesar\n"
 "corectã dacã nu reporniþi programul.\n"
 
-#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "[revocatã] "
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expira"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3425,7 +3193,7 @@
 "              Aceastã comandã poate cauza ca un alt ID utilizator\n"
 "              sã devinã ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3434,45 +3202,45 @@
 "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:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 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:2607
+#: g10/keyedit.c:2608
 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:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "ªtergeþi aceastã semnãturã bunã? (d/N/t)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "ªtergeþi aceastã semnãturã invalidã? (d/N/t)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "ªtergeþi aceastã semnãturã necunoscutã? (d/N/t)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "ªtergeþi într-adevãr aceastã auto-semnãturã? (d/N)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Am ºters %d semnãturã.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Am ºters %d semnãturi.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Nu am ºters nimic.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3482,34 +3250,34 @@
 "revocator          desemnat poate face ca unele versiuni de PGP sã respingã "
 "cheia.\n"
 
-#: g10/keyedit.c:2885
+#: g10/keyedit.c:2886
 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:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduceþi ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 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:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVERTISMENT: Aceastã cheie a fost revocatã revocatorul desemnat!\n"
 
-#: g10/keyedit.c:2984
+#: g10/keyedit.c:2985
 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:2990
+#: g10/keyedit.c:2991
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3517,129 +3285,129 @@
 "Sunteþi sigur(ã) cã doriþi sã desemnaþi aceastã cheie ca ºi revocator "
 "desemnat? (d/N): "
 
-#: g10/keyedit.c:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Vã rugãm ºtergeþi selecþiile din cheile secrete.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Vã rugãm selectaþi cel mult o cheie secundarã.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Schimbarea timpului de expirare pentru o cheie secundarã.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimbarea timpului de expirare pentru o cheie primarã.\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semnãturã corespunzãtoare în inelul secret\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Vã rugãm selectaþi exact un ID utilizator.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "auto-semnãturi v3 sãrite pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/keyedit.c:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, fuzzy
 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:3496
+#: g10/keyedit.c:3497
 #, fuzzy
 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:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nici o cheie secundarã cu indicele %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   semnatã de %08lX la %s%s%s\n"
 
-#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (non-exportabilã)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceastã semnãturã a expirat pe %s.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 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:3738
+#: g10/keyedit.c:3739
 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:3765
+#: g10/keyedit.c:3766
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Aþi semnat aceste ID-uri utilizator:\n"
 
-#: g10/keyedit.c:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non-exportabilã)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat de %08lX la %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunteþi pe cale sã revocaþi aceste semnãturi:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 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:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "nici o cheie secretã\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, 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:4126
+#: g10/keyedit.c:4127
 #, fuzzy, 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 0x%08lX (uid %d)\n"
@@ -3968,7 +3736,7 @@
 "Aveþi nevoie de o frazã-parolã pentru a vã proteja cheia secretã.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4232,7 +4000,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opþiuni export invalide\n"
@@ -4247,106 +4015,106 @@
 msgid "key not found on keyserver\n"
 msgstr "cheia `%s' nu a fost gãsitã: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "cer cheia %08lX de la %s\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "cer cheia %08lX de la %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "caut pentru \"%s\" de pe serverul HKP %s\n"
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "semnatã cu cheie d-voastrã %08lX la %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "caut pentru \"%s\" de pe serverul HKP %s\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "caut pentru \"%s\" de pe serverul HKP %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opþiuni export invalide\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "eroare server de chei"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "eroare server de chei"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "recepþie server de chei eºuatã: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVERTISMENT: nu pot ºterge fiºierul temporar (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "cer cheia %08lX de la %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "cer cheia %08lX de la %s\n"
@@ -4523,7 +4291,7 @@
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "necunoscut"
 
@@ -4701,50 +4469,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nu este disponibil în aceastã sesiune\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "nu pot seta pid-ul client pentru agent\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "nu pot convinge serverul sã citeascã FD pentru agent\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "nu pot convinge serverul sã scrie FD pentru agent\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormalã\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, 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:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nu mã pot conecta la `%s': %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "probleme de comunicare cu gpg-agent\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problemã cu agentul - deactivez  folosirea agentului\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cheie principalã %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4756,41 +4524,41 @@
 "\"%.*s\"\n"
 "%u-bit cheia %s, ID %08lX, creatã %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Repetaþi fraza-parolã\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Introduceþi fraza-parolã\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "frazã-parolã prea lungã\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "rãspuns invalid de la agent\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "anulatã de utilizator\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problemã cu agentul: agentul returneazã 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "nu pot cere parola în modul batch\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Introduceþi fraza-parolã: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4800,17 +4568,17 @@
 "Aveþi nevoie de o frazã-parolã pentru a descuia cheia\n"
 "secretã pentru utilizator: \""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cheia %2$s de %1$u-biþi, ID %3$08lX, creatã %4$s"
 
-#: g10/passphrase.c:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Repetaþi fraza-parolã: "
 
@@ -5696,12 +5464,12 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb este coruptã; rulaþi \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linii de intrare mai lungi de %d caractere\n"
@@ -5760,7 +5528,7 @@
 msgid "[ revoked]"
 msgstr "[revocatã] "
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expiratã] "
@@ -5770,101 +5538,101 @@
 msgid "[ unknown]"
 msgstr "necunoscut"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "niciodatã     "
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "nu e nevoie de o verificare pentru trustdb\n"
 
-#: g10/trustdb.c:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "urmãtoarea verificare pentru trustdb programatã pe %s\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "nu e nevoie de o verificare pentru trustdb\n"
 
-#: g10/trustdb.c:604
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nu e nevoie de o verificare pentru trustdb\n"
 
-#: g10/trustdb.c:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "cheia publicã %08lX nu a fost gãsitã: %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "vã rugãm faceþi un --check-trustdb\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "verific trustdb\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, 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:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "nu am gãsit nici o cheie cu încredere supremã\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "cheia publicã a cheii cu încredere supremã %08lX nu a fost gãsitã\n"
 
-#: g10/trustdb.c:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "înregistrare încredere %lu, tip %d: scrierea a eºuat: %s\n"
@@ -6136,6 +5904,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "terminã"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "tT"
@@ -6174,6 +5946,158 @@
 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 "q"
+#~ msgstr "t"
+
+#~ msgid "help"
+#~ msgstr "ajutor"
+
+#~ msgid "list"
+#~ msgstr "enumerã"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "depanare"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "activ"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "semloc"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "ampr"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsem"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "eroare generalã"
+
+#~ msgid "passwd"
+#~ msgstr "parola"
+
+#~ msgid "save"
+#~ msgstr "salveazã"
+
+#~ msgid "fpr"
+#~ msgstr "ampr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "cheie"
+
+#~ msgid "check"
+#~ msgstr "verificã"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "semneazã"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "semneazã"
+
+#~ msgid "lsign"
+#~ msgstr "semloc"
+
+#~ msgid "nrsign"
+#~ msgstr "semirev"
+
+#~ msgid "nrlsign"
+#~ msgstr "semlirev"
+
+#~ msgid "adduid"
+#~ msgstr "adauid"
+
+#~ msgid "addphoto"
+#~ msgstr "adapoza"
+
+#~ msgid "deluid"
+#~ msgstr "steuid"
+
+#~ msgid "delphoto"
+#~ msgstr "stepoza"
+
+#~ msgid "addkey"
+#~ msgstr "adacheie"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "adacheie"
+
+#~ msgid "delkey"
+#~ msgstr "stecheie"
+
+#~ msgid "addrevoker"
+#~ msgstr "adarev"
+
+#~ msgid "delsig"
+#~ msgstr "stesem"
+
+#~ msgid "expire"
+#~ msgstr "expira"
+
+#~ msgid "primary"
+#~ msgstr "primar"
+
+#~ msgid "toggle"
+#~ msgstr "comuta"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "afispref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "actpref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "eroare server de chei"
+
+#~ msgid "trust"
+#~ msgstr "incred"
+
+#~ msgid "revsig"
+#~ msgstr "revsem"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revcheie"
+
+#~ msgid "disable"
+#~ msgstr "deact"
+
+#~ msgid "enable"
+#~ msgstr "activ"
+
+#~ msgid "showphoto"
+#~ msgstr "afispoza"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "algoritm rezumat `%s' este numai-citire în acestã ediþie\n"
 
Index: gnupg/po/ru.po
diff -u gnupg/po/ru.po:1.51 gnupg/po/ru.po:1.52
--- gnupg/po/ru.po:1.51	Fri Dec 10 23:20:42 2004
+++ gnupg/po/ru.po	Tue Dec 14 08:49:27 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GnuPG 1.2.4\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2003-12-23 19:24+0100\n"
 "Last-Translator: Maxim Britov <maxbritov at tut.by>\n"
 "Language-Team: Russian <gnupg-ru at gnupg.org>\n"
@@ -31,7 +31,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -355,7 +355,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -566,165 +566,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "пропущено: секретный ключ уже имеется\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "Выход"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "q"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "несовместимые команды\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "help"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "показать эту справку"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "list"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Ключ доступен: "
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "debug"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "enable"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsign"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "сменить срок действия"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "показать отпечаток"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "общая ошибка"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "создать новую пару ключей"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Команда> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "несовместимые команды\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "несовместимые команды\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
@@ -769,7 +692,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "повторный ввод пароля некорректен; попробуйте еще раз"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -779,13 +702,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ `%s' не найден: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1241,7 +1164,7 @@
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
@@ -1249,7 +1172,7 @@
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
@@ -1353,7 +1276,7 @@
 msgid "reading options from `%s'\n"
 msgstr "настройки взяты из файла `%s'\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного использования!\n"
@@ -1364,336 +1287,336 @@
 msgstr ""
 "расширение шифра \"%s\" не загружено вследствие небезопасных прав доступа\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s недопустимая таблица символов\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URI сервера ключей\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заменит %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s недопустимо использовать с %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2614
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Вы не можете одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2620
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Вы должны использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/g10.c:2635
+#: g10/g10.c:2633
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифровки сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2742
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2744
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 1, 2 или 3\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой (0) режим S2K строго не рекомендуется\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s не работает пока с %s\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать шифрование \"%s\" в режиме %s\n"
 
-#: g10/g10.c:2862
+#: g10/g10.c:2860
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать хэш-функцию \"%s\" в режиме %s\n"
 
-#: g10/g10.c:2867
+#: g10/g10.c:2865
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать сжатие \"%s\" в режиме %s\n"
 
-#: g10/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "сбой расшифрования: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Вы не можете использовать %s в режиме %s\n"
 
-#: g10/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Вы не можете использовать %s в режиме %s\n"
 
-#: g10/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "неудача при отправке на сервер ключей: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "неудача при получении с сервера ключей: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "не удалось экспортировать ключ: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "неудача при поиске на сервере ключей: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "неудача при обновлении на сервере ключей: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1701,23 +1624,23 @@
 "имя примечания должно содержать только печатные символы или пробелы,и "
 "заканчиваться знаком '='\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "имя примечания должно содержать '@' символ\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "значение примечания не должно содержать управляющие символы\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL правил сертификации неверен\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL правил подписи неверен\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL правил подписи неверен\n"
@@ -2574,12 +2497,12 @@
 msgstr "User ID \"%s\" отозван."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Вы уверены, что хотите это подписать? (y/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  Не могу подписать.\n"
 
@@ -2781,7 +2704,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2834,18 +2757,10 @@
 msgstr "перемещение подписи ключа в правильное место\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "save"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "сохранить и выйти"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "показать отпечаток"
 
@@ -2854,504 +2769,357 @@
 msgstr "вывести список ключей и User ID"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "выбрать User ID N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "key"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "выбрать вторичный ключ N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "check"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "вывести список подписей"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "подписать ключ"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "sign"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "создать отделенную (detached) подпись"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "локально подписать ключ"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "подписать ключ без возможности отзыва"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "подписать ключ локально и без возможности отзыва"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "добавить User ID"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "добавить фото ID"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "удалить User ID"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "добавить вторичный ключ"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "удалить вторичный ключ"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "добавить ключ отзыва"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "удалить подпись"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "сменить срок действия"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primary"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "пометить User ID как главный"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "переключение между открытым и закрытым ключами"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "список предпочтений (экспертам)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "список предпочтений (подробный)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "установить предпочтения"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "обновить предпочтения"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "ошибка сервера ключей"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "не могу проанализировать URI сервера ключей\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "сменить пароль"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "отзыв подписей"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "отзыв User ID"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "отзыв подключей"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "отключить ключ"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "включить ключ"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "показать фото ID"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "ошибка чтения секретного блока ключа `%s': %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Секретный ключ доступен.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Для данного действия нужен секретный ключ.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Сначала воспользуйтесь командой \"toggle\".\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "Ключ отозван."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Вы действительно хотите подписать ВСЕ User ID? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Подсказка: Выберите User IDs для подписи\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Данная команда не допустима в режиме %s.\n"
 
-#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "Вы должны выбрать хотя бы один User ID.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "Вы не можете удалить последний User ID!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Вы действительно хотите удалить ВСЕ выбранные User IDs? "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Вы действительно хотите удалить данный User ID? "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Вы действительно хотите удалить данный User ID? "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Вы действительно хотите удалить выбранные ключи? "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Вы действительно хотите удалить данный ключ? "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Действительно отозвать ВСЕ выбранные User ID? "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Действительно отозвать данный User ID? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Вы действительно хотите отозвать выбранные ключи? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Вы действительно хотите отозвать данный ключ? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "установить предпочтения"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Действительно обновить предпочтения для выбранных User ID? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Действительно обновить предпочтения? "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Сохранить изменения? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без сохранения? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "сбой при обновлении: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "сбой при обновлений секретного ключа: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr "ключ не изменялся - обновление не нужно.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Хэш-функции: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Опции: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван ключом %s "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "не могу создать %s: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[отозван]"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [годен до: %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [годен до: %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " доверие: %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " доверие: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3359,19 +3127,19 @@
 "Заметьте, что показанные степени достоверности могут быть неверными,\n"
 "пока Вы не перезапустите программу.\n"
 
-#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "[отозван]"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3379,7 +3147,7 @@
 "ВНИМАНИЕ: нет User ID отмеченного как главный.  Данная команда может\n"
 "              использовать другой User ID в качестве главного.\n"
 
-#: g10/keyedit.c:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3388,45 +3156,45 @@
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:2607
+#: g10/keyedit.c:2608
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Вы можете не добавлять фото ID в ключ PGP2-типа.\n"
 
-#: g10/keyedit.c:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Удалена %d подпись.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Удалено %d подписи.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3435,159 +3203,159 @@
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:2885
+#: g10/keyedit.c:2886
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Вы не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить PGP 2.x ключ, как назначенный отзывающим\n"
 
-#: g10/keyedit.c:2943
+#: g10/keyedit.c:2944
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:2965
+#: g10/keyedit.c:2966
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "ВНИМАНИЕ: Данный ключ отозван отзывающим ключом!\n"
 
-#: g10/keyedit.c:2984
+#: g10/keyedit.c:2985
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим не возможно будет отменить!\n"
 
-#: g10/keyedit.c:2990
+#: g10/keyedit.c:2991
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N): "
 
-#: g10/keyedit.c:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Выделите не более одного вторичного ключа.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Смена срока действия вторичного ключа.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Вы не можете изменить срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы действительно хотите использовать его? (y/N)"
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3497
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы действительно хотите использовать его? (y/N)"
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Нет вторичного ключа с индексом %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   подписан %08lX  %s%s%s\n"
 
-#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок подписи закончился %s.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:3738
+#: g10/keyedit.c:3739
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:3765
+#: g10/keyedit.c:3766
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID:\n"
 
-#: g10/keyedit.c:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   отозван %08lX  %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ %s фото ID размера %ld для ключа 0x%08lX (uid %d)\n"
@@ -3915,7 +3683,7 @@
 "Для защиты секретного ключа необходим пароль.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4177,7 +3945,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "недопустимые параметры экспорта\n"
@@ -4192,106 +3960,106 @@
 msgid "key not found on keyserver\n"
 msgstr "ключ `%s' не найден: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "запрос ключа %08lX с %s\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "запрос ключа %08lX с %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "поиск \"%s\" на HKP сервере %s\n"
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "подписанный Вашим ключом %08lX  %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "поиск \"%s\" на HKP сервере %s\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "поиск \"%s\" на HKP сервере %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "ошибка сервера ключей"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "ошибка сервера ключей"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "неудача при получении с сервера ключей: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ВНИМАНИЕ: не могу удалить временный файл (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "запрос ключа %08lX с %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "запрос ключа %08lX с %s\n"
@@ -4468,7 +4236,7 @@
 msgid "textmode"
 msgstr "текстовый"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "неизвестен"
 
@@ -4641,50 +4409,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent недоступен в данной сессии\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "не могу установить pid для агента\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "не могу получить дескриптор чтения для агента\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "не могу получить дескриптор записи для агента\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "протокол gpg-agent версии %d не поддерживается\n"
 
-#: g10/passphrase.c:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "не могу подключиться к `%s': %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "коммуникационный проблемы с gpg-agent\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "проблема с агентом - использование агента отключено\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (главный идентификатор ключа %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4695,41 +4463,41 @@
 "\"%.*s\"\n"
 "%u-бит %s ключ, ID %08lX, создан %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Повторите пароль\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Введите пароль\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "пароль слишком длинный\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "неверный ответ от агента\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "прервано пользователем\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "проблема с агентом: агент вернул 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "не могу получить пароль в пакетном режиме\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Введите пароль: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4739,17 +4507,17 @@
 "Необходим пароль для доступа к секретному ключу пользователя:\n"
 "\""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бит %s ключ, ID %08lX, создан %s"
 
-#: g10/passphrase.c:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Повторите пароль: "
 
@@ -5616,12 +5384,12 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "таблица доверий повреждена; запустите \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "не могу обработать строки текста длиннее %d символов\n"
 
-#: g10/textfilter.c:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "строка ввода длиннее %d символов\n"
@@ -5680,7 +5448,7 @@
 msgid "[ revoked]"
 msgstr "[отозван]"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[просрочен]"
@@ -5690,101 +5458,101 @@
 msgid "[ unknown]"
 msgstr "неизвестен"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "никогда   "
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "нет необходимости в проверке таблицы доверий\n"
 
-#: g10/trustdb.c:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "срок следующей проверки таблицы доверий %s\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "нет необходимости в проверке таблицы доверий\n"
 
-#: g10/trustdb.c:604
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "нет необходимости в проверке таблицы доверий\n"
 
-#: g10/trustdb.c:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "открытый ключ %08lX не найден: %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "выполните --check-trustdb, пожалуйста\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "проверка таблицы доверий\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ключей обработано (%d дейсвующих записей очищено)\n"
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "не найдено абсолютно доверяемых ключей\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "открытый ключ для абсолютно доверяемого ключа %08lX не найден\n"
 
-#: g10/trustdb.c:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "запись о доверии %lu, тип %d: ошибка записи: %s\n"
@@ -6056,6 +5824,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "Выход"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
@@ -6095,6 +5867,158 @@
 "(возможно, Вы используете неподходящее программное обеспечение\n"
 "для данной задачи)\n"
 
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "list"
+#~ msgstr "list"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsign"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fpr"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "общая ошибка"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "save"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "key"
+
+#~ msgid "check"
+#~ msgstr "check"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "sign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "addkey"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "primary"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "ошибка сервера ключей"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "хэш-функция `%s' в данной версии только для чтения\n"
 
Index: gnupg/po/sk.po
diff -u gnupg/po/sk.po:1.8 gnupg/po/sk.po:1.9
--- gnupg/po/sk.po:1.8	Fri Dec 10 23:20:42 2004
+++ gnupg/po/sk.po	Tue Dec 14 08:49:27 2004
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <mmajer at econ.umb.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -29,7 +29,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -351,7 +351,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -562,165 +562,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "preskoèené: tajný kµúè je u¾ v databáze\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "ukonèi»"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "ukonèi» toto menu"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "u"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktné príkazy\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "help"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "ukáza» túto pomoc"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "list"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Kµúè k dispozícii na: "
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "debug"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "enable"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsign"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeni» dobu platnosti"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmeni» dôveryhodnos» vlastníka kµúèa"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vypísa» fingerprint"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "v¹eobecná chyba"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvori» nový pár kµúèov"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Príkaz> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktné príkazy\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktné príkazy\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajný kµúè do `%s'\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatný príkaz (skúste \"help\")\n"
 
@@ -765,7 +688,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo nie je zopakované správne; skúste to znovu"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -775,13 +698,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento príkaz nefunguje\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: 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:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1246,7 +1169,7 @@
 msgid "Pubkey: "
 msgstr "Verejné kµúèe: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "©ifry: "
 
@@ -1254,7 +1177,7 @@
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Kompresia: "
 
@@ -1361,7 +1284,7 @@
 msgid "reading options from `%s'\n"
 msgstr "èítam mo¾nosti z `%s'\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZNÁMKA: %s nie je pre normálne pou¾itie!\n"
@@ -1373,340 +1296,340 @@
 "¹ifra \"%s\" nebola nahraná, preto¾e prístupové práva nie sú nastavené "
 "bezpeène\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo¾no pou¾i» URI servera kµúèov - chyba analýzy URI\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatný parameter pre import\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatný parameter pre import\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo¾no nastavi» exec-path na %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program mô¾e vytvori» súbor core!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prepí¹e %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolené pou¾íva» %s s %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedáva s %s zmysel!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 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/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 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/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný ¹ifrovací algoritmus je neplatný\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybraný ¹ifrovací algoritmus je neplatný\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo¾ka completes-needed musí by» väè¹ia ako 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo¾ka marginals-needed musí by» väè¹ia ako 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, 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/g10.c:2744
+#: g10/g10.c:2742
 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/g10.c:2746
+#: g10/g10.c:2744
 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/g10.c:2749
+#: g10/g10.c:2747
 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/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatný mód S2K; musí by» 0, 1 alebo 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "neplatné defaultné predvoµby\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné u¾ívateµské predvoµby pre ¹ifrovanie\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné u¾ívateµské predvoµby pre hashovanie\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné u¾ívateµské predvoµby pre kompresiu\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e¹te nepracuje s %s\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, 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/g10.c:2862
+#: g10/g10.c:2860
 #, 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/g10.c:2867
+#: g10/g10.c:2865
 #, 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/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemô¾em inicializova» databázu dôvery: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 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/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [meno súboru]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno súboru]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de¹ifrovanie zlyhalo: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno súboru]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno súboru]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, 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/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [meno súboru]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno súboru]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno súboru]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, 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/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno súboru]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno súboru]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno súboru]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key id u¾ívateµa"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u¾ívateµa"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id u¾ívateµa"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id u¾ívateµa"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u¾ívateµa [príkazy]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 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/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla» kµúè na server: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija» kµúè zo servera: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export kµúèa: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa nájs» server: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualizácia servera zlyhala: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[meno súboru]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Zaènite písa» svoju správu ...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1714,23 +1637,23 @@
 "meno mô¾e obsahova» len písmená, èíslice, bodky, podèiarníky alebo medzery a "
 "konèi» s '='\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "hodnota musí obsahova» znak '@'\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nesmie obsahova» ¾iadne kontrolné znaky\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pre certifikaènú politiku je neplatné\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
@@ -2600,12 +2523,12 @@
 msgstr "U¾ívateµské ID \"%s\" je revokované."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  Nemo¾no podpísa».\n"
 
@@ -2809,7 +2732,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Skutoène podpísa»? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2862,18 +2785,10 @@
 msgstr "presúvam podpis kµúèa na správne miesto\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "ulo¾i»"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "ulo¾i» a ukonèi»"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "vypísa» fingerprint"
 
@@ -2882,504 +2797,357 @@
 msgstr "vypísa» zoznam kµúèov a id u¾ívateµov"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "vyberte identifikátor u¾ívateµa N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "key"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "vyberte sekundárny kµúè N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "check"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "vypísa» zoznam podpisov"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "podpísa» kµúè"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "sign"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "vytvori» podpis oddelený od dokumentu"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "podpísa» kµúè lokálne"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "podpísa» kµúè bez mo¾nosti odvola» podpis (non-revocably)"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "podpísa» kµúè lokálne a bez mo¾nosti odvola» podpis (non-revocably)"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "prida» identifikátor u¾ívateµa"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "prida» fotografické ID"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "zmaza» identifikátor u¾ívateµa"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "prida» sekundárny kµúè"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "zmaza» sekundárny kµúè"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "prida» revokaèný kµúè"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "zmaza» podpisy"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "zmeni» dobu platnosti"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primary"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "oznaèi» u¾ívateµské ID ako primárne"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "prepnú» medzi vypísaním zoznamu tajných a verejných kµúèov"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "vypísa» zoznam predvolieb (pre expertov)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "vypísa» zoznam predvolieb (podrobne)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "nastavi» zoznam predvolieb"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "aktualizova» predvoµby"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "chyba servera kµúèov"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "nemo¾no pou¾i» URI servera kµúèov - chyba analýzy URI\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "zmeni» heslo"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "zmeni» dôveryhodnos» vlastníka kµúèa"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "revokova» podpisy"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revsig"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "revokova» identifikátor u¾ívateµa"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "revokova» sekundárny kµúè"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "nastavi» kµúè ako neplatný (disable)"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "nastavi» kµúè ako platný (enable)"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "ukáza» fotografické ID"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, 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:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Tajný kµúè je dostupný.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Na vykonanie tejto operácie je potrebný tajný kµúè.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Prosím, najskôr pou¾ite príkaz \"toggle\" (prepnú»).\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "Kµúè revokovaný."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Skutoène podpísa» v¹etky id u¾ívateµa? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Nápoveda: Vyberte id u¾ívateµa na podpísanie\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, 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:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "Musíte vybra» aspoò jedno id u¾ívateµa.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "Nemô¾ete zmaza» posledné id u¾ívateµa!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, 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:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Skutoène odstráni» toto id u¾ívateµa? "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Skutoène odstráni» toto id u¾ívateµa? "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Musíte vybra» aspoò jeden kµúè.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Musíte vybra» aspoò jeden kµúè.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Skutoène chcete zmaza» vybrané kµúèe? "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Skutoène chcete zmaza» tento kµúè? "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Skutoène revokova» v¹etky vybrané id u¾ívateµa? "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Skutoène revokova» toto id u¾ívateµa? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Skutoène chcete revokova» vybrané kµúèe? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Skutoène chcete revokova» tento kµúè? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "nastavi» zoznam predvolieb"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, 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:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Skutoène aktualizova» predvoµby? "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ulo¾i» zmeny? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ukonèi» bez ulo¾enia? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizácia tajného kµúèa zlyhala: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr "kµúè nebol zmenený, tak¾e nie je potrebné ho aktualizova».\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, 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:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citlivá informácia)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nemô¾em vytvori»: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokované]"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnos» skonèí: %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos» skonèí: %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " dôvera: %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " dôvera: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Tento kµúè bol oznaèený za neplatný (disabled)"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 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:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3387,19 +3155,19 @@
 "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:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "[revokované]"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3407,7 +3175,7 @@
 "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:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3416,45 +3184,45 @@
 "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:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 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:2607
+#: g10/keyedit.c:2608
 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:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza» tento dobrý podpis? (a/N/u)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza» tento neplatný podpis? (a/N/u)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza» tento neznámy podpis? (a/N/u)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skutoène zmaza» tento podpis podpísaný sebou samým? (a/N)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazaný %d podpis.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazaných %d podpisov.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Niè nebolo zmaznané.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3463,159 +3231,159 @@
 "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:2885
+#: g10/keyedit.c:2886
 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:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo¾te identifikátor u¾ívateµa povereného revokáciou: "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 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:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 #, 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:2984
+#: g10/keyedit.c:2985
 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:2990
+#: g10/keyedit.c:2991
 #, 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:3051
+#: g10/keyedit.c:3052
 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:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Prosím, vyberte najviac jeden sekundárny kµúè.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Mením dobu platnosti sekundárneho kµúèa.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Mením dobu platnosti primárneho kµúèa.\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 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:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosím, vyberte práve jedno id u¾ívateµa.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, 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:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, 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:3496
+#: g10/keyedit.c:3497
 #, 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:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor u¾ívateµa s indexom %d\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Neexistuje sekundárny kµúè s indexom %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u¾ívateµa: \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, 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:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (nexeportovateµné)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos» podpisu vypr¹í %s.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 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:3738
+#: g10/keyedit.c:3739
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori» pre tento podpis revokaèný certifikát? (a/N)"
 
-#: g10/keyedit.c:3765
+#: g10/keyedit.c:3766
 #, 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:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovateµné)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokované %08lX v %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte sa revokova» tieto podpisy:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skutoène vytvori» revokaèné certifikáty? (a/N) "
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "neexistuje tajný kµúè\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u¾ívateµské ID \"%s\" je u¾ revokované\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, 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:4126
+#: g10/keyedit.c:4127
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3944,7 +3712,7 @@
 "Na ochranu Vá¹ho tajného kµúèa musíte zada» heslo.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4206,7 +3974,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatný parameter pre export\n"
@@ -4221,106 +3989,106 @@
 msgid "key not found on keyserver\n"
 msgstr "kµúè `%s' nebol nájdený: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po¾adujem kµúè %08lX z %s\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po¾adujem kµúè %08lX z %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, 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:1049
+#: g10/keyserver.c:1054
 #, 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:1092
+#: g10/keyserver.c:1097
 #, 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:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyhµadávam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "chyba servera kµúèov"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "chyba servera kµúèov"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "nepodarilo sa prija» kµúè zo servera: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, 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:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "po¾adujem kµúè %08lX z %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "po¾adujem kµúè %08lX z %s\n"
@@ -4504,7 +4272,7 @@
 msgid "textmode"
 msgstr "textový mód"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "neznáme"
 
@@ -4678,50 +4446,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d má nastavený kritický bit\n"
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie je v tomto sedení dostupný\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "nemô¾em nastavi» PID klienta pre gpg-agenta\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "nemo¾no získa» server read file descriptor pre agenta\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "nemo¾no získa» server write file descriptor pre agenta\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zlý formát premennej prostredia GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, 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:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nemô¾em sa pripoji» k `%s': %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "problém v komunikácii s gpg-agentom\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problém s agentom - pou¾ívanie agenta vypnuté\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hlavné ID kµúèa %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4732,41 +4500,41 @@
 "\"%.*s\"\n"
 "kµúè s då¾kou %u bitov, typ %s, ID %08lX, vytvorený %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Opakova» heslo\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Vlo¾i» heslo\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "heslo je príli¹ dlhé\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "neplatná reakcia od agenta\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "zru¹ené u¾ívateµom\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problém s agentom: agent vracia 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, 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:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Vlo¾te heslo: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4776,17 +4544,17 @@
 "Musíte pozna» heslo, aby ste odomkli tajný kµúè pre\n"
 "u¾ívateµa: \""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, 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:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
@@ -5671,12 +5439,12 @@
 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:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "vstupný riadok je dlh¹í ako %d znakov\n"
@@ -5736,7 +5504,7 @@
 msgid "[ revoked]"
 msgstr "[revokované]"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expirované]"
@@ -5746,101 +5514,101 @@
 msgid "[ unknown]"
 msgstr "neznáme"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "nikdy     "
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: 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:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal¹ia kontrola databázy dôvery %s\n"
 
-#: g10/trustdb.c:589
+#: 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:604
+#: 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:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "verejný kµúè %08lX nebol nájdený: %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "prosím vykonajte --check-trustdb\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "kontrolujem databázu dôvery\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, 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:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "neboli nájdené ¾iadne absolútne dôveryhodné kµúèe\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, 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:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, 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"
@@ -6112,6 +5880,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "ukonèi»"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "uUqQ"
@@ -6149,6 +5921,158 @@
 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 "q"
+#~ msgstr "u"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "list"
+#~ msgstr "list"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsign"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fpr"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "v¹eobecná chyba"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "ulo¾i»"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "key"
+
+#~ msgid "check"
+#~ msgstr "check"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "sign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "addkey"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "primary"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "chyba servera kµúèov"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revsig"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "hashovací algoritmus `%s' je len na èítanie v tejto verzii\n"
 
Index: gnupg/po/sv.po
diff -u gnupg/po/sv.po:1.18 gnupg/po/sv.po:1.19
--- gnupg/po/sv.po:1.18	Fri Dec 10 23:20:41 2004
+++ gnupg/po/sv.po	Tue Dec 14 08:49:27 2004
@@ -17,13 +17,13 @@
 # who sends his thanks to André Dahlqvist <andre at beta.telenordia.se>
 # and to his wife Olivia <olivia at resare.com>. 
 #
-# $Id: sv.po,v 1.18 2004/12/10 22:20:41 wk Exp $
+# $Id: sv.po,v 1.19 2004/12/14 07:49:27 wk Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.6\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2004-12-01 17:49+0100\n"
 "Last-Translator: Per Tunedal <info at clipanish.com>\n"
 "Language-Team: Swedish <sv at li.org>\n"
@@ -47,7 +47,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -376,7 +376,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -586,166 +586,87 @@
 msgid "secret key already stored on a card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "avsluta"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "q"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "motstridiga kommandon\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "help"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "visa en lista"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Nyckeln tillgänglig hos: "
 
-# ???
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "avlusa"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "enable"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsign"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "ändra utgångsdatum"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
 # originalet borde ha ett value
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-# skall dessa översättas?
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "allmänt fel"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Felaktigt kommando (försök med \"help\")\n"
 
@@ -791,7 +712,7 @@
 msgstr "lösenmeningen upprepades inte korrekt; försök igen."
 
 # se förra kommentaren
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -801,13 +722,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1278,7 +1199,7 @@
 msgid "Pubkey: "
 msgstr "öppen nyckel: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "Chiffer: "
 
@@ -1286,7 +1207,7 @@
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Komprimering: "
 
@@ -1391,7 +1312,7 @@
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
@@ -1401,349 +1322,349 @@
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "chiffertillägget \"%s\" laddades inte pga osäkra behörigheter\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "felaktiga importinställningar\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "felaktiga importinställningar\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte sätta exec-sökvägen till %s\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 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/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "för att kryptera meddelanden i --pgp2-läge krävs IDEA-insticksprogrammet\n"
 
-#: g10/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är felaktig\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen ä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/g10.c:2738
+#: g10/g10.c:2736
 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/g10.c:2740
+#: g10/g10.c:2738
 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/g10.c:2742
+#: g10/g10.c:2740
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "variabeln \"max-cert-depth\" måste ha ett värde mellan 1 och 255\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/g10.c:2744
+#: g10/g10.c:2742
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "felaktigt 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/g10.c:2746
+#: g10/g10.c:2744
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "felaktigt minimivärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "felaktigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "felaktiga 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/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "felaktig inställning av vilka krypteringsalgoritmer du föredrar\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "felaktig inställning av vilka checksummealgoritmer du föredrar\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "felaktig inställning av vilka kompressionsalgoritmer du föredrar\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du kan inte använda chifferalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/g10.c:2862
+#: g10/g10.c:2860
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "du kan inte använda sammandragsalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/g10.c:2867
+#: g10/g10.c:2865
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "du kan inte använda komprimeringsalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: Du har valt mottagare (-r) trots att symmetrisk kryptering valts\n"
 
-#: g10/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s läge\n"
 
-#: g10/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s läge\n"
 
-#: g10/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key användaridentitet"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key användaridentitet"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Export av nyckeln misslyckades: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig kontrollsummealgoritm `%s'\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1754,23 +1675,23 @@
 # user notation name??
 # Werner:
 # That is an OpenPGP notation name not registered with IANA.
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsvärde får inte inehålla några kontrolltecken\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifikationspolicy är felaktig\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
@@ -2667,12 +2588,12 @@
 msgstr "Användar-ID \"%s\" är spärrat."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
@@ -2881,7 +2802,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2934,18 +2855,9 @@
 msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "save"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-# skall dessa översättas?
-#: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
 #: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "visa fingeravtryck"
@@ -2955,508 +2867,360 @@
 msgstr "visa en lista på nycklar och användaridentiteter"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "välj användaridentitet N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "key"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "välj undernyckel N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "check"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "visa en lista på signaturer"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "signera nyckeln"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "sign"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "skapa signatur i en separat fil"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "signera nyckeln lokalt"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "signera nyckeln utan möjlighet att återkalla signaturen"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "signera en nyckel lokalt utan möjlighet till återkallelse"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "lägg till ett foto som användaridentitet"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "ta bort en användaridentitet"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "lägg till en undernyckel"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "ta bort en undernyckel"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "lägg till en spärrnyckel"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "ta bort signaturer"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "ändra utgångsdatum"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primary"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "markera användaridentiteten som huvudidentitet"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "hoppa mellan att visa en lista på hemliga eller öppna nycklar"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "visa en lista på  inställningar (expertläge)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "visa en lista på inställningar (utförligt)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "ange inställningslista"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "uppdaterat inställningar"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "nyckelserverfel"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "ändra lösenmening"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
 # originalet borde ha ett value
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "Ã¥terkalla signaturer"
 
-# ska detta översättas? Verkar vara ett kommando.
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "spärra en användaridentitet"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "spärra en undernyckel"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "stäng av en nyckel"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "aktivera en nyckel"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "visa foto-ID"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fel vid läsning av hemligt nyckelblock\"%s\": %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 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:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "Nyckeln är spärrad."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vill du verkligen signera alla användaridentiteter? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Välj de användarID:n du vill signera\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, 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:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vill du verkligen ta bort alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vill du verkligen ta bort denna användaridentitet? "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Vill du verkligen radera denna egensignatur? (j/N)"
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vill du verkligen spärra alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vill du verkligen spärra denna användaridentitet? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Vill du verkligen spärra de valda nycklarna? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Vill du verkligen spärra denna nyckel? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ange inställningslista"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Vill du verkligen ändra inställningarna?"
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Spara ändringarna? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 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:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denna nyckel kan spärras av nyckeln %s"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (känsligt)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan inte skapa %s: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[går ut: %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[går ut: %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " tillit: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 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 ett användar-ID av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3464,19 +3228,19 @@
 "Obs! Den visade nyckelgiltigheten kan vara felaktig\n"
 "om du inte startar om programmet.\n"
 
-#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3485,7 +3249,7 @@
 "Detta kommando kan göra att ett annat användar-ID antas\n"
 "vara huvudidentitet.\n"
 
-#: g10/keyedit.c:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3495,46 +3259,46 @@
 "vissa versioner\n"
 "         av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 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:2607
+#: g10/keyedit.c:2608
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan inte lägga till ett fofo-ID till en nyckel av PGP 2-typ.\n"
 
-#: g10/keyedit.c:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Vill du verkligen radera denna egensignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3543,33 +3307,33 @@
 "VARNING: Detta är en PGP 2-nyckel. Om du anger en spärrnyckel kan denna "
 "nyckel inte användas i vissa versioner av PGP.\n"
 
-#: g10/keyedit.c:2885
+#: g10/keyedit.c:2886
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du får inte ange en spärrnyckel för en PGP 2-nyckel.\n"
 
-#: g10/keyedit.c:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användar-ID för spärrnyckeln: "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 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-nyckel som spärrnyckel\n"
 
-#: g10/keyedit.c:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
 
-#: g10/keyedit.c:2984
+#: g10/keyedit.c:2985
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VARNING: det går aldrig att ändra om du utser en spärrnyckel!\n"
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: g10/keyedit.c:2990
+#: g10/keyedit.c:2991
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3577,135 +3341,135 @@
 "Är du verkligen säker på att du vill utse denna nyckel till spärrnyckel? (j/"
 "N): "
 
-#: g10/keyedit.c:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Välj som högst en undernyckel.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Ändrar giltighetstid för en undernyckel.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för huvudnyckeln.\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Du måste välja bara en användaridentitet.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hoppar över v3 egensignatur på användar-id \"%s\"\n"
 
-#: g10/keyedit.c:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Vill du verkligen använda det (j/N)?"
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3497
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Vill du verkligen använda det (j/N)?"
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen undernyckel med index %d\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Vill du verkligen spärra denna nyckel? (j/N)"
 
-#: g10/keyedit.c:3738
+#: g10/keyedit.c:3739
 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:3765
+#: g10/keyedit.c:3766
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har signerat följande användaridentiteter:\n"
 
-#: g10/keyedit.c:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   spärrad av %08lX %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du står i begrepp att återkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (y/N) "
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VARNING: en signatur på ett användar-ID är daterad %d sekunder in i "
 "framtiden\n"
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy, 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 0x%08lX (uid %d)\n"
@@ -4037,7 +3801,7 @@
 "Du behöver en lösenmening för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4302,7 +4066,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
@@ -4317,104 +4081,104 @@
 msgid "key not found on keyserver\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
@@ -4601,7 +4365,7 @@
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "okänd"
 
@@ -4775,52 +4539,52 @@
 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:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
 # vad är detta?
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "kan inte ange pid för GPG-Agent\n"
 
 # FD?
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "kan inte få server-läs FD för GPG-Agent\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "kan inte få server-skriv FD för GPG-Agent\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, 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:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "problem vid kommunikation med GPG-Agent\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem med GPG-Agent, stänger av den\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (huvudnyckelns identitet %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4831,41 +4595,41 @@
 "användaren: \"%.*s\"\n"
 "%u-bitars %s-nyckel, ID %08lX, skapad %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Repetera lösenmeningen\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Ange lösenmening\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "lösenmeningen är för lång\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "felaktigt svar från GPG-Agent\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem med GPG-Agent: programmet svarar 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "kan inte fråga efter lösenmening i batch-läge\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Ange lösenmening: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4875,17 +4639,17 @@
 "Du behöver en lösenmening för att låsa upp den hemliga nyckeln för\n"
 "användaren: \""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits  %s-nyckel, ID %08lX, skapad %s"
 
-#: g10/passphrase.c:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Repetera lösenmeningen: "
 
@@ -5806,12 +5570,12 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "tillitsdatabasen är trasig, kör \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "indataraden är längre än %d tecken\n"
@@ -5874,7 +5638,7 @@
 msgid "[ revoked]"
 msgstr "[spärrad]"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[Giltighetstiden har gått ut]"
@@ -5884,105 +5648,105 @@
 msgid "[ unknown]"
 msgstr "okänd"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "aldrig"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, 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:589
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:604
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "hittade inte den öppna nyckeln %08lX :%s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 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:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "kontrollerar  tillitsdatabasen\n"
 
 # Vad är detta!?
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d nycklar behandlade (%d validity counts rensade)\n"
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "Hittar inte den öppna nyckeln tillhörande den förbehållslöst betrodda "
 "nyckeln %08lX \n"
 
-#: g10/trustdb.c:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
@@ -6255,6 +6019,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "avsluta"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "aA"
@@ -6292,6 +6060,162 @@
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan ha använt fel program för denna uppgift)\n"
 
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "list"
+#~ msgstr "visa en lista"
+
+# ???
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "avlusa"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsign"
+
+# skall dessa översättas?
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fpr"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "allmänt fel"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "save"
+
+# skall dessa översättas?
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "key"
+
+#~ msgid "check"
+#~ msgstr "check"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "sign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "addkey"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "primary"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "nyckelserverfel"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+# ska detta översättas? Verkar vara ett kommando.
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "sammandragsalgoritmen `%s' kan endast läsas i denna programutgåva\n"
 
Index: gnupg/po/tr.po
diff -u gnupg/po/tr.po:1.14 gnupg/po/tr.po:1.15
--- gnupg/po/tr.po:1.14	Fri Dec 10 23:20:41 2004
+++ gnupg/po/tr.po	Tue Dec 14 08:49:27 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2004-07-08 08:10+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun at superonline.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a at lists.sourceforge.net>\n"
@@ -32,7 +32,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -355,7 +355,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -568,165 +568,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "atlandı: gizli anahtar zaten var\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "quit"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "k"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "çelişen komutlar\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "help"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "bunu gösterir "
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "list"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Anahtar burada: "
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "debug"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "enable"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsign"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "son kullanım tarihini değiştirir"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "parmak izini gösterir"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "genel hata"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n"
 
@@ -773,7 +696,7 @@
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
 "tekrarlanacak"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -783,13 +706,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar `%s' yok: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1248,7 +1171,7 @@
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "Åžifre: "
 
@@ -1256,7 +1179,7 @@
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
@@ -1360,7 +1283,7 @@
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
@@ -1370,334 +1293,334 @@
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "şifre uzantısı \"%s\" güvensiz izinlerden dolayı yüklenmedi\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s geçerli bir karakter seti değil\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2614
 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/g10.c:2622
+#: g10/g10.c:2620
 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/g10.c:2635
+#: g10/g10.c:2633
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti ÅŸifrelemesi IDEA ÅŸifresi gerektirir\n"
 
-#: g10/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, fuzzy
 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/g10.c:2744
+#: g10/g10.c:2742
 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/g10.c:2746
+#: g10/g10.c:2744
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BÄ°LGÄ°: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s henüz %s ile çalışmıyor\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s şifreleme algoritması kullanılamayabilir.\n"
 
-#: g10/g10.c:2862
+#: g10/g10.c:2860
 #, fuzzy, 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ılamayabilir.\n"
 
-#: g10/g10.c:2867
+#: g10/g10.c:2865
 #, fuzzy, 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ılamayabilir.\n"
 
-#: g10/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 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/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key KULL-KML"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key KULL-KML"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh başarısız: %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1705,23 +1628,23 @@
 "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
 "sonuna bir '=' gelir.\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
@@ -2581,12 +2504,12 @@
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
@@ -2788,7 +2711,7 @@
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2843,18 +2766,10 @@
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "save"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "parmak izini gösterir"
 
@@ -2863,507 +2778,360 @@
 msgstr "anahtarı ve kullanıcı kimliğini gösterir"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "key"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "N yardımcı anahtarını seçer"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "check"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "imzaları listeler"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "k"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "anahtarı imzalar"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "i"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "sign"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "bağımsız bir imza yapar"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "anahtarı yerel olarak imzala"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "yürürlükten kaldırılamayan imza yapar"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "yürürlükten kaldırılamayan yerel imza yapar"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "bir foto kimliÄŸi ekler"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "kullanıcı kimliğini siler"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "bir yardımcı anahtar siler"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "bir yürürlükten kaldırma anahtarı ekler"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "imzaları siler"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "son kullanım tarihini değiştirir"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primary"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "b"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "tercih listesi oluşturmak için"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "güncelenmiş tercihler"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "anahtar sunucusu hatası"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "bir kullanıcı kimliği yürürlükten kaldırır"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "bir yardımcı anahtarı yürürlükten kaldırır"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "bir anahtarı iptal eder"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "bir anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "foto kimliğini gösterir"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, fuzzy, 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:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tüm kullanıcı kimlikleri gerçekten imzalanacak mı? "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 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:1527
+#: g10/keyedit.c:1528
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten iptal edilecek mi? "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Bu kullanıcı kimliği gerçekten iptal edilecek mi? "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Seçilen anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Bu anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "tercih listesi oluşturmak için"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor "
 "musunuz? "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "DeÄŸiÅŸiklikler kaydedilecek mi? "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kaydetmeden çıkılsın mı? "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "Özümlenen: "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Bu anahtar %s tarafından şu anahtarla yürürlükten kaldırılmış olabilir: "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (duyarlı)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s oluşturulamıyor: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[yürürlükten kaldırıldı] "
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " güvencesi: %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " güvencesi: %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmiÅŸti"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 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:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3371,19 +3139,19 @@
 "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:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "[yürürlükten kaldırıldı] "
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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"
@@ -3392,7 +3160,7 @@
 "       başka bir kullanıcı kimliğinin birincil varsayılmasına sebep "
 "olabilir.\n"
 
-#: g10/keyedit.c:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3401,45 +3169,45 @@
 "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:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:2607
+#: g10/keyedit.c:2608
 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:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doÄŸru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3449,41 +3217,41 @@
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:2885
+#: g10/keyedit.c:2886
 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:2905
+#: g10/keyedit.c:2906
 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:2928
+#: g10/keyedit.c:2929
 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:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/keyedit.c:2984
+#: g10/keyedit.c:2985
 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:2990
+#: g10/keyedit.c:2991
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3491,130 +3259,130 @@
 "bir anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H): "
 
-#: g10/keyedit.c:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 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:3110
+#: g10/keyedit.c:3111
 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:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, fuzzy, 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:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Onu kullanmak istediÄŸinizden emin misiniz? (e/H) "
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3497
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Onu kullanmak istediÄŸinizden emin misiniz? (e/H) "
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d endeksine sahip yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   %08lX ile %s%s%s de imzalanmış\n"
 
-#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 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:3738
+#: g10/keyedit.c:3739
 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:3765
+#: g10/keyedit.c:3766
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n"
 
-#: g10/keyedit.c:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   %08lX tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 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:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, 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:4126
+#: g10/keyedit.c:4127
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3946,7 +3714,7 @@
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4210,7 +3978,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
@@ -4225,106 +3993,106 @@
 msgid "key not found on keyserver\n"
 msgstr "anahtar `%s' yok: %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "%08lX anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "%08lX anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 " %08lX anahtarınızla %s de imzalandı\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "anahtar sunucusu hatası"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "anahtar sunucusu hatası"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "keyserver receive başarısızlığa uğradı: %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "UYARI: geçici dosya silinemiyor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "%08lX anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%08lX anahtarı %s adresinden isteniyor\n"
@@ -4505,7 +4273,7 @@
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "bilinmeyen"
 
@@ -4682,50 +4450,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "istemci pid'i belirlenemiyor\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "sunucu okuma dosya tanıtıcısı alınamadı\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "sunucu yazma dosya tanıtıcısı alınamadı\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, 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:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent ile haberleÅŸme problemi\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (asıl anahtar kimliği %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4736,41 +4504,41 @@
 "kullanıcısının gizli anahtarını açacak bir anahtar parolasına ihtiyaç var.\n"
 "%u bitlik %s anahtarı, kimlik %08lX, oluşturulan %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "Parolayı tekrar yazınız\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "Anahtar parolasını giriniz\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "Parola çok uzun\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "yanıt geçersiz\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "kullanıcı tarafından durduruldu\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "önceden tanımlanmış işlemler kipinde (batchmode) parola sorgulanamaz\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "Anahtar parolasını girin: "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4780,19 +4548,19 @@
 "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
 "Anahtarın sahibi: \""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr ""
 "%u bitlik %s anahtarı, %08lX kimliği ile\n"
 "%s tarihinde üretilmiş"
 
-#: g10/passphrase.c:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "Tekrar: "
 
@@ -5678,12 +5446,12 @@
 msgstr ""
 "güvence veritabanı bozulmuş; lütfen \"gpg --fix-trustdb\" çalıştırın.\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, 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:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "girdi satırı %d karakterden daha uzun\n"
@@ -5742,7 +5510,7 @@
 msgid "[ revoked]"
 msgstr "[yürürlükten kaldırıldı] "
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[süresi doldu] "
@@ -5752,101 +5520,101 @@
 msgid "[ unknown]"
 msgstr "bilinmeyen"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "asla    "
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sonraki güvence veritabanı denetimi %s de\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:604
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "%08lX genel anahtarı yok: %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "lütfen bir --check-trustdb yapın\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d anahtar iÅŸlendi (%d doÄŸrulama temizlendi)\n"
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "son derece güvenli bir anahtar yok\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "son derece güvenli %08lX genel anahtarı yok\n"
 
-#: g10/trustdb.c:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "güvence veritabanının %lu. kaydı, %d türünde: yazma başarısız: %s\n"
@@ -6118,6 +5886,10 @@
 msgid "nN"
 msgstr "hH"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "quit"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "çÇ"
@@ -6157,6 +5929,158 @@
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 
+#~ msgid "q"
+#~ msgstr "k"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "list"
+#~ msgstr "list"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsign"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fpr"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "genel hata"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "save"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "key"
+
+#~ msgid "check"
+#~ msgstr "check"
+
+#~ msgid "c"
+#~ msgstr "k"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "i"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "sign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "addkey"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "primary"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "b"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "anahtar sunucusu hatası"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "bu dağıtımda özümleme algoritması %s salt-okunurdur\n"
 
Index: gnupg/po/zh_CN.po
diff -u gnupg/po/zh_CN.po:1.8 gnupg/po/zh_CN.po:1.9
--- gnupg/po/zh_CN.po:1.8	Fri Dec 10 23:20:41 2004
+++ gnupg/po/zh_CN.po	Tue Dec 14 08:49:27 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2004-11-08 21:30+0800\n"
 "Last-Translator: Meng Jie <zuxyhere at eastday.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation at lists.linux.net.cn>\n"
@@ -31,7 +31,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -345,7 +345,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
@@ -539,151 +539,79 @@
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "quit"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "q"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr "admin"
-
 #: g10/card-util.c:1252
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "help"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "显示这份在线说明"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "list"
-
 #: g10/card-util.c:1255
 msgid "list all available data"
 msgstr "列出所有可用数据"
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "debug"
-
-#: g10/card-util.c:1258
-msgid "name"
-msgstr "name"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr "更改卡持有人的姓名"
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr "url"
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr "更改获取密钥的 URL"
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr "fetch"
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr "根据卡中指定的 URL 获取密钥"
 
-#: g10/card-util.c:1262
-msgid "login"
-msgstr "login"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 msgid "change the login name"
 msgstr "更改登录名"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr "lang"
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 msgid "change the language preferences"
 msgstr "更改首选语言首选"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr "性别"
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr "更改卡持有人的性别"
 
-#: g10/card-util.c:1265
-msgid "cafpr"
-msgstr "cafpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 msgid "change a CA fingerprint"
 msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:1266
-msgid "forcesig"
-msgstr "forcesig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr "设定 PIN 签字是否必须"
 
-#: g10/card-util.c:1268
-msgid "generate"
-msgstr "generate"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 msgid "generate new keys"
 msgstr "生成新的密钥"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr "更改或解锁 PIN 的菜单"
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "命令> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 msgid "Admin-only command\n"
 msgstr "仅供管理员使用的命令\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 msgid "Admin commands are allowed\n"
 msgstr "允许使用管理员命令\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
@@ -730,7 +658,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN 再次输入时与首次输入不符;请再试一次"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -740,13 +668,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "密钥‘%s’找不到:%s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1193,7 +1121,7 @@
 msgid "Pubkey: "
 msgstr "公钥:"
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "对称加密:"
 
@@ -1201,7 +1129,7 @@
 msgid "Hash: "
 msgstr "散列:"
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "压缩:"
 
@@ -1305,7 +1233,7 @@
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意:一般情况下不会用到 %s!\n"
@@ -1315,347 +1243,347 @@
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d:无效的公钥服务器选项\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d:无效的导入选项\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d:无效的导出选项\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d:无效的列表选项\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d:无效的校验选项\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告:程序可能会创建核心内存转储!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告:%s 会使得 %s 失效\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义!\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签字\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2614
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时,不能同时签字和加密\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2620
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件,而非管道\n"
 
-#: g10/g10.c:2635
+#: g10/g10.c:2633
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签字数一定要大于 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签字数一定要大于 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大认证深度一定要介于 1 和 255 之间\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2742
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别;一定要是 0,1,2 或 3\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2744
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别;一定要是 1,2 或 3\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意:强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式;必须是 0,1 或 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/g10.c:2862
+#: g10/g10.c:2860
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/g10.c:2867
+#: g10/g10.c:2865
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败:%s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告:给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败:%s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key 用户标识"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key 用户标识"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败:%s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败:%s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败:%s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败:%s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败:%s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败:%s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败:%s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "标记名称必须只含有可打印的字符或空格,并以一个“=”来结尾\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "用户标记名称一定要含有“@”字符\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "标记值一定不能使用任何的控制字符\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签字策略 URL 无效\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -2495,12 +2423,12 @@
 msgstr "用户标识“%s”已被吊销。"
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "您仍然想要为它签字吗?(y/N)"
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  无法添加签字。\n"
 
@@ -2674,7 +2602,7 @@
 msgid "Really sign? (y/N) "
 msgstr "真的要签字吗?(y/N)"
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2726,18 +2654,10 @@
 msgstr "正在把密钥的签字移动到正确的位置去\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "save"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "保存并离开"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "显示指纹"
 
@@ -2746,505 +2666,361 @@
 msgstr "列出密钥和用户标识"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "选择用户标识 N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "key"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "选择子钥 N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "check"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "列出签字"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "为密钥添加签字"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-msgid "tsign"
-msgstr "tsign"
-
 #: g10/keyedit.c:1259
 msgid "make a trust signature"
 msgstr "生成一份信任的签字"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "为密钥添加本地签字"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "为密钥添加不可吊销签字"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "为密钥添加不可吊销的本地签字"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "增加一个用户标识"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "增加一个照片标识"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "删除一个用户/照片标识"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "增加一把子钥"
 
-#: g10/keyedit.c:1271
-msgid "addcardkey"
-msgstr "addcardkey"
-
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1272
 msgid "add a key to a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: g10/keyedit.c:1272
-msgid "keytocard"
-msgstr "卡密钥"
-
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr "将一把密钥移动到智能卡上"
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "删除一把子钥"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "增加一把吊销密钥"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "删除签字"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "更改使用期限"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primary"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "设定首选用户标识"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "在私钥和公钥清单间切换"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "列出首选项(专家模式)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "列出首选项(详细模式)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "设定首选项"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "更新过的首选项"
 
-#: g10/keyedit.c:1286
-msgid "keyserver"
-msgstr "keyserver"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 msgid "set preferred keyserver URL"
 msgstr "设定首选公钥服务器的 URL"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "更改密码"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "更改信任度"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "吊销签字"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "吊销一个用户标识"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "吊销一把子钥"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "禁用一把密钥"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "启用一把密钥"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "显示照片标识"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "读取私钥区块“%s”时出错:%s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "私钥可用。\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "要有私钥才能这么做。\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "请先使用“toggle”指令。\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "密钥已被吊销。"
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的为所有的用户标识签字吗?(y/N)"
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示:选择要添加签字的用户标识\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允许使用这个指令。\n"
 
-#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "您至少得选择一个用户标识。\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "您不能删除最后一个用户标识!\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要删除所有被选择的用户标识吗?(y/N)"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要删除这个用户标识吗?(y/N)"
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要删除主钥吗?(y/N)"
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 msgid "You must select exactly one key.\n"
 msgstr "您必须指定一把密钥。\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "您必须选择至少一把密钥。\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "您真的想要删除被选择的密钥吗?(y/N)"
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "您真的要删除这把密钥吗?(y/N)"
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要吊销所有被选择的用户标识吗?(y/N)"
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要吊销这个用户标识吗?(y/N)"
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "您真的想要吊销被选择的密钥吗?(y/N)"
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "您真的想要吊销这把密钥吗?(y/N)"
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 msgid "Set preference list to:\n"
 msgstr "设为首选项列表为:\n"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新被选择用户标识的首选项吗?(y/N)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1776
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新首选项吗?(y/N)"
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 msgid "Save changes? (y/N) "
 msgstr "要保存变动吗?(y/N)"
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 msgid "Quit without saving? (y/N) "
 msgstr "要不保存而离开吗?(y/N)"
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败:%s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私钥失败:%s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变动所以不需要更新。\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "散列:"
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "特点:"
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可变造"
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器:"
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这把密钥可被 %s 密钥 %s 吊销"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2252
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, c-format
 msgid "created: %s"
 msgstr "创建于:%s"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销:%s"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, c-format
 msgid "expired: %s"
 msgstr "已过期:%s"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, c-format
 msgid "expires: %s"
 msgstr "有效至:%s"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, c-format
 msgid "usage: %s"
 msgstr "可用于:%s"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, c-format
 msgid "trust: %s"
 msgstr "信任度:%s"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr "有效性:%s"
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr "卡号:"
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意,在您重启程序之前,显示的密钥有效性未必正确,\n"
 
-#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3253,45 +3029,45 @@
 "警告:这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗?(y/N)"
 
-#: g10/keyedit.c:2607
+#: g10/keyedit.c:2608
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签字吗?(y/N/q)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签字吗?(y/N/q)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签字吗?(y/N/q)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自身签字吗?(y/N)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已经删除了 %d 个签字。\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已经删除了 %d 个签字。\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3300,160 +3076,160 @@
 "警告:这是一把 PGP2 样式的密钥。\n"
 "     增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:2885
+#: g10/keyedit.c:2886
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识:"
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 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:2943
+#: g10/keyedit.c:2944
 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:2965
+#: g10/keyedit.c:2966
 msgid "this key has already been designated as a revoker\n"
 msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:2984
+#: g10/keyedit.c:2985
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告:将某把密钥指派为指定吊销者的操作无法撤销!\n"
 
-#: g10/keyedit.c:2990
+#: g10/keyedit.c:2991
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗?(y/N):"
 
-#: g10/keyedit.c:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "请至多选择一把子钥。\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "正在变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更v3密钥的使用期限\n"
 
-#: g10/keyedit.c:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私钥环里没有一致的签字\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签字\n"
 
-#: g10/keyedit.c:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选的公钥服务器的 URL:"
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗?(y/N)"
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3497
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗?(y/N)"
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "没有索引为 %d 的子钥\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识:“%s”\n"
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s(%s) 签字\n"
 
-#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "这份签字已在 %s 过期。\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗?(y/N)"
 
-#: g10/keyedit.c:3738
+#: g10/keyedit.c:3739
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签字生成一份吊销证书吗?(y/N)"
 
-#: g10/keyedit.c:3765
+#: g10/keyedit.c:3766
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经为这些密钥 %s 上的这些用户标识添加签字:\n"
 
-#: g10/keyedit.c:3791
+#: g10/keyedit.c:3792
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签字:\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗?(y/N)"
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告:有一份用户标识签字的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld,属于密钥 %s,用户标识 %d)\n"
@@ -3774,7 +3550,7 @@
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4028,7 +3804,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "输入数字以选择,输入 N 翻页,输入 Q 退出 >"
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
@@ -4042,101 +3818,101 @@
 msgid "key not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "下载密钥‘%s’,从 %s 服务器 %s\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "下载密钥 %s,从 %s\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "将密钥‘%s’上传到 %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "搜索“%s”,在 %s 服务器 %s 上\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "搜索“%s”,在 %s 上\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 msgid "no keyserver action!\n"
 msgstr "公钥服务器无动作!\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告:处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr "公钥服务器未发送 VERSION\n"
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "这一编译版本不支持外部调用公钥服务器\n"
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "没有处理‘%s’公钥服务器的程序\n"
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr "gpgkeys_%s 不支持对版本 %d 的处理\n"
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 msgid "keyserver timed out\n"
 msgstr "公钥服务器超时\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 msgid "keyserver internal error\n"
 msgstr "公钥服务器内部错误\n"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "公钥服务器通讯错误:%s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s”不是一个用户标识:跳过\n"
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告:无法更新密钥 %s,通过 %s:%s\n"
 
-#: g10/keyserver.c:1600
+#: g10/keyserver.c:1607
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d 个密钥正从 %s 得到更新\n"
@@ -4313,7 +4089,7 @@
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "未知"
 
@@ -4482,50 +4258,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类别的子包设定了关键位\n"
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "无法设定代理程序客户端的进程标识\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "无法取得代理程序所需的服务器读取文件描述符\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "无法取得代理程序所需的服务器写入文件描述符\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
 
-#: g10/passphrase.c:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "无法连接至‘%s’:%s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "与 gpg-agent 通讯有问题\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "代理程序的问题――正在停用代理程序\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(主钥匙号 %s)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4536,57 +4312,57 @@
 "“%.*s”\n"
 "%u 位的 %s 密钥,钥匙号 %s,建立于 %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "请再输入一次密码\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "请输入密码\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "密码太长\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "代理程序响应无效\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "用户取消\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "代理程序的问题:代理程序返回 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 msgid "can't query passphrase in batch mode\n"
 msgstr "在批处理模式中无法查询密码\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "请输入密码:"
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr "您需要输入密码,才能解开这个用户的私钥:“%s”\n"
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位的 %s 密钥,钥匙号 %s,建立于 %s"
 
-#: g10/passphrase.c:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "        (主钥 %s 的子钥)"
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "请再输入一次密码:"
 
@@ -5418,12 +5194,12 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "信任度数据库已损坏;请执行“gpg --fix-trustdb”。\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "无法处理长于 %d 字符的文本行\n"
 
-#: g10/textfilter.c:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "输入行长度超过 %d 字符\n"
@@ -5482,7 +5258,7 @@
 msgid "[ revoked]"
 msgstr "已吊销"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "已过期"
@@ -5492,103 +5268,103 @@
 msgid "[ unknown]"
 msgstr "未知"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 #, fuzzy
 msgid "[marginal]"
 msgstr "勉强"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 #, fuzzy
 msgid "[ultimate]"
 msgstr "绝对"
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr "未定义"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 msgid "never"
 msgstr "从不"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr "勉强"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr "完全"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr "绝对"
 
-#: g10/trustdb.c:574
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数据库检查将于 %s 进行\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:590
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:604
+#: g10/trustdb.c:605
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
 
-#: g10/trustdb.c:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公钥 %s:%s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "请执行一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "正在检查信任度数据库\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "没有找到任何绝对信任的密钥\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
 
-#: g10/trustdb.c:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "需要 %d 份勉强信任和 %d 份完全信任,%s 信任模型\n"
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, 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:2147
+#: g10/trustdb.c:2148
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录:写入失败:%s\n"
@@ -5858,6 +5634,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "quit"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
@@ -5894,6 +5674,168 @@
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(您可能使用了错误的程序来完成此项任务)\n"
 
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "admin"
+#~ msgstr "admin"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "list"
+#~ msgstr "list"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#~ msgid "name"
+#~ msgstr "name"
+
+#~ msgid "url"
+#~ msgstr "url"
+
+#~ msgid "fetch"
+#~ msgstr "fetch"
+
+#~ msgid "login"
+#~ msgstr "login"
+
+#~ msgid "lang"
+#~ msgstr "lang"
+
+#~ msgid "sex"
+#~ msgstr "性别"
+
+#~ msgid "cafpr"
+#~ msgstr "cafpr"
+
+#~ msgid "forcesig"
+#~ msgstr "forcesig"
+
+#~ msgid "generate"
+#~ msgstr "generate"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "save"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "key"
+
+#~ msgid "check"
+#~ msgstr "check"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "tsign"
+#~ msgstr "tsign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#~ msgid "addcardkey"
+#~ msgstr "addcardkey"
+
+#~ msgid "keytocard"
+#~ msgstr "卡密钥"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "primary"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#~ msgid "keyserver"
+#~ msgstr "keyserver"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "‘%s’散列算法在本发行版本中只读\n"
 
Index: gnupg/po/zh_TW.po
diff -u gnupg/po/zh_TW.po:1.8 gnupg/po/zh_TW.po:1.9
--- gnupg/po/zh_TW.po:1.8	Fri Dec 10 23:20:40 2004
+++ gnupg/po/zh_TW.po	Tue Dec 14 08:49:27 2004
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\n"
-"POT-Creation-Date: 2004-12-10 20:16+0100\n"
+"POT-Creation-Date: 2004-12-14 08:40+0100\n"
 "PO-Revision-Date: 2003-05-13 15:48+0800\n"
 "Last-Translator: Jedi <Jedi at idej.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@ -33,7 +33,7 @@
 
 #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248
 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -353,7 +353,7 @@
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315
 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -564,165 +564,88 @@
 msgid "secret key already stored on a card\n"
 msgstr "¤w¸õ¹L¡G¨pÆ_¤w¸g¦s¦b\n"
 
-#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
-msgid "quit"
-msgstr "quit"
-
 #: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "Â÷¶}³o­Ó¿ï³æ"
 
-#: g10/card-util.c:1251 g10/keyedit.c:1246
-msgid "q"
-msgstr "q"
-
-#: g10/card-util.c:1252
-msgid "admin"
-msgstr ""
-
 #: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "«ü¥O©¼¦¹¥Ù¬Þ\n"
 
 #: g10/card-util.c:1253 g10/keyedit.c:1248
-msgid "help"
-msgstr "help"
-
-#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "Åã¥Ü³o¥÷½u¤W»¡©ú"
 
-#: g10/card-util.c:1255 g10/keyedit.c:1251
-msgid "list"
-msgstr "list"
-
 #: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "¨S¦³¥i¥Îªº»¡©ú"
 
-#: g10/card-util.c:1256 g10/keyedit.c:1252
-msgid "l"
-msgstr "l"
-
-#: g10/card-util.c:1257 g10/keyedit.c:1263
-msgid "debug"
-msgstr "debug"
-
-#: g10/card-util.c:1258
-#, fuzzy
-msgid "name"
-msgstr "enable"
-
 #: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
 #: g10/card-util.c:1259
-msgid "url"
-msgstr ""
-
-#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
 #: g10/card-util.c:1260
-msgid "fetch"
-msgstr ""
-
-#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1262
-#, fuzzy
-msgid "login"
-msgstr "lsign"
-
-#: g10/card-util.c:1262
+#: g10/card-util.c:1261
 #, fuzzy
 msgid "change the login name"
 msgstr "§ó§ï¨Ï¥Î´Á­­"
 
-#: g10/card-util.c:1263
-msgid "lang"
-msgstr ""
-
-#: g10/card-util.c:1263
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the language preferences"
 msgstr "§ó§ï¥DÆ[«H¥ô"
 
-#: g10/card-util.c:1264
-msgid "sex"
-msgstr ""
-
-#: g10/card-util.c:1264
+#: g10/card-util.c:1263
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1265
-#, fuzzy
-msgid "cafpr"
-msgstr "fpr"
-
-#: g10/card-util.c:1265
+#: g10/card-util.c:1264
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "Åã¥Ü«ü¯¾"
 
-#: g10/card-util.c:1266
-#, fuzzy
-msgid "forcesig"
-msgstr "revsig"
-
-#: g10/card-util.c:1267
+#: g10/card-util.c:1265
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1268
-#, fuzzy
-msgid "generate"
-msgstr "¤@¯ë©Ê¿ù»~"
-
-#: g10/card-util.c:1269
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "generate new keys"
 msgstr "²£¥Í¤@¥÷·sªºª÷Æ_¹ï"
 
-#: g10/card-util.c:1270 g10/keyedit.c:1287
-msgid "passwd"
-msgstr "passwd"
-
-#: g10/card-util.c:1270
+#: g10/card-util.c:1267
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1272
-msgid "privatedo"
-msgstr ""
-
-#: g10/card-util.c:1336 g10/keyedit.c:1397
+#: g10/card-util.c:1333 g10/keyedit.c:1398
 msgid "Command> "
 msgstr "«ü¥O> "
 
-#: g10/card-util.c:1371
+#: g10/card-util.c:1368
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "«ü¥O©¼¦¹¥Ù¬Þ\n"
 
-#: g10/card-util.c:1387
+#: g10/card-util.c:1384
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "«ü¥O©¼¦¹¥Ù¬Þ\n"
 
-#: g10/card-util.c:1389
+#: g10/card-util.c:1386
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "¥¿¦b±N¨pÆ_¼g¦Ü `%s'\n"
 
-#: g10/card-util.c:1458 g10/keyedit.c:1864
+#: g10/card-util.c:1455 g10/keyedit.c:1865
 msgid "Invalid command  (try \"help\")\n"
 msgstr "µL®Äªº«ü¥O  (¸Õ¸Õ¬Ý \"help\")\n"
 
@@ -767,7 +690,7 @@
 msgid "PIN not correctly repeated; try again"
 msgstr "±K½X¦ê¦A¦¸¿é¤J®É¨S¦³¥¿½T­«½Æ¡F½Ð¦A¸Õ¤@¦¸"
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -777,13 +700,13 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output ¦b³o­Ó©R¥O¤¤¨S¦³§@¥Î\n"
 
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "§ä¤£¨ì `%s' ª÷Æ_¡G %s\n"
 
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1233,7 +1156,7 @@
 msgid "Pubkey: "
 msgstr "¤½Æ_¡G "
 
-#: g10/g10.c:756 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1902
 msgid "Cipher: "
 msgstr "½s±Kªk¡G "
 
@@ -1241,7 +1164,7 @@
 msgid "Hash: "
 msgstr "Âø´ê¡G "
 
-#: g10/g10.c:768 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1948
 msgid "Compression: "
 msgstr "À£ÁY¡G "
 
@@ -1345,7 +1268,7 @@
 msgid "reading options from `%s'\n"
 msgstr "±q `%s' Ū¨ú¿ï¶µ\n"
 
-#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
+#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "½Ðª`·N¡G¤@¯ë±¡ªp¤U¤£·|¥Î¨ì %s¡I\n"
@@ -1355,357 +1278,357 @@
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "½s±Kªk©µ¦ù¼Ò²Õ \"%s\" ¦]¬°³\¥i¤£¦w¥þ¦Ó¥¼³Q¸ü¤J\n"
 
-#: g10/g10.c:2293
+#: g10/g10.c:2291
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ¤£¬O¤@­Ó¦³®Äªº¦r¤¸¶°\n"
 
-#: g10/g10.c:2312 g10/keyedit.c:3434
+#: g10/g10.c:2310 g10/keyedit.c:3435
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "µLªk¤ÀªRª÷Æ_¦øªA¾¹ URI\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2316
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: µL®Äªº¶×¥X¿ï¶µ\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2319
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "µL®Äªº¶×¥X¿ï¶µ\n"
 
-#: g10/g10.c:2328
+#: g10/g10.c:2326
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: µL®Äªº¶×¤J¿ï¶µ\n"
 
-#: g10/g10.c:2331
+#: g10/g10.c:2329
 msgid "invalid import options\n"
 msgstr "µL®Äªº¶×¤J¿ï¶µ\n"
 
-#: g10/g10.c:2338
+#: g10/g10.c:2336
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: µL®Äªº¶×¥X¿ï¶µ\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2339
 msgid "invalid export options\n"
 msgstr "µL®Äªº¶×¥X¿ï¶µ\n"
 
-#: g10/g10.c:2348
+#: g10/g10.c:2346
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: µL®Äªº¶×¤J¿ï¶µ\n"
 
-#: g10/g10.c:2351
+#: g10/g10.c:2349
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "µL®Äªº¶×¤J¿ï¶µ\n"
 
-#: g10/g10.c:2373
+#: g10/g10.c:2371
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: µL®Äªº¶×¥X¿ï¶µ\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2374
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "µL®Äªº¶×¥X¿ï¶µ\n"
 
-#: g10/g10.c:2383
+#: g10/g10.c:2381
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "µLªk§â°õ¦æÀɸô®|³]¦¨ %s\n"
 
-#: g10/g10.c:2573
+#: g10/g10.c:2571
 msgid "WARNING: program may create a core file!\n"
 msgstr "ĵ§i¡Gµ{¦¡¥i¯à·|¶É¦L¥X®Ö¤ßÀÉ¡I\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2575
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ĵ§i¡G %s ·|¨Ï±o %s ¥¢®Ä\n"
 
-#: g10/g10.c:2586
+#: g10/g10.c:2584
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ¤£³Q¤¹³\¸ò %s ¨Ö¥Î\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2587
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ¸ò %s ©ñ¦b¤@°_¨S¦³·N¸q¡I\n"
 
-#: g10/g10.c:2610
+#: g10/g10.c:2608
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "©p¬é¦³¦b --pgp2 ¼Ò¦¡¤UÅׯవ¥X¤ÀÂ÷¦¡©Î©ú¤åñ³¹\n"
 
-#: g10/g10.c:2616
+#: g10/g10.c:2614
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "©p¦b --pgp2 ¼Ò¦¡¤U®É¡A¤£¯à¦P®Éñ¸p©M¥[±K\n"
 
-#: g10/g10.c:2622
+#: g10/g10.c:2620
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "±Ò¥Î --pgp2 ®É©p¬éÀ³¸Ó¨Ï¥ÎÀɮסA¦Ó«DºÞ¹D\n"
 
-#: g10/g10.c:2635
+#: g10/g10.c:2633
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "¦b --pgp2 ¼Ò¦¡¤U¥[±K°T®§»Ý­n IDEA ½s±Kªk\n"
 
-#: g10/g10.c:2705 g10/g10.c:2729
+#: g10/g10.c:2703 g10/g10.c:2727
 msgid "selected cipher algorithm is invalid\n"
 msgstr "©Ò¿ïªº½s±KºtºâªkµL®Ä\n"
 
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2709 g10/g10.c:2733
 msgid "selected digest algorithm is invalid\n"
 msgstr "©Ò¿ïªººK­nºtºâªkµL®Ä\n"
 
-#: g10/g10.c:2717
+#: g10/g10.c:2715
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "©Ò¿ïªº½s±KºtºâªkµL®Ä\n"
 
-#: g10/g10.c:2723
+#: g10/g10.c:2721
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "©Ò¿ïªº¾ÌÃÒºK­nºtºâªkµL®Ä\n"
 
-#: g10/g10.c:2738
+#: g10/g10.c:2736
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ¤@©w­n¤j©ó 0\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2738
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ¤@©w­n¤j©ó 1\n"
 
-#: g10/g10.c:2742
+#: g10/g10.c:2740
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ¤@©w­n¤¶©ó 1 ©M 255 ¤§¶¡\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2742
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "µL®Äªº default-check-level ¡F¤@©w­n¬O 0 ¡B 1 ¡B 2 ©Î 3\n"
 
-#: g10/g10.c:2746
+#: g10/g10.c:2744
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "µL®Äªº default-check-level ¡F¤@©w­n¬O 0 ¡B 1 ¡B 2 ©Î 3\n"
 
-#: g10/g10.c:2749
+#: g10/g10.c:2747
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "½Ðª`·N¡G±j¯P¤£«Øij¨Ï¥Î³æ¯Âªº S2K ¼Ò¦¡ (0)\n"
 
-#: g10/g10.c:2753
+#: g10/g10.c:2751
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "µL®Äªº S2K ¼Ò¦¡¡F¤@©w­n¬O 0 ¡B 1 ©Î 3\n"
 
-#: g10/g10.c:2760
+#: g10/g10.c:2758
 msgid "invalid default preferences\n"
 msgstr "µL®Äªº¹w³]°¾¦n\n"
 
-#: g10/g10.c:2769
+#: g10/g10.c:2767
 msgid "invalid personal cipher preferences\n"
 msgstr "µL®Äªº­Ó¤H½s±Kªk°¾¦n\n"
 
-#: g10/g10.c:2773
+#: g10/g10.c:2771
 msgid "invalid personal digest preferences\n"
 msgstr "µL®Äªº­Ó¤HºK­n°¾¦n\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2775
 msgid "invalid personal compress preferences\n"
 msgstr "µL®Äªº­Ó¤HÀ£ÁY°¾¦n\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2808
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ¸ò %s ©ñ¦b¤@°_¨S¦³·N¸q¡I\n"
 
-#: g10/g10.c:2857
+#: g10/g10.c:2855
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n"
 
-#: g10/g10.c:2862
+#: g10/g10.c:2860
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n"
 
-#: g10/g10.c:2867
+#: g10/g10.c:2865
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n"
 
-#: g10/g10.c:2963
+#: g10/g10.c:2961
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "«H¥ô¸ê®Æ®w±Ò©l¥¢±Ñ¡G %s\n"
 
-#: g10/g10.c:2974
+#: g10/g10.c:2972
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "ĵ§i¡Gµ¹©wªº¦¬¥óªÌ (-r) ¥¼¨Ï¥Î¤½Æ_¥[±K\n"
 
-#: g10/g10.c:2985
+#: g10/g10.c:2983
 msgid "--store [filename]"
 msgstr "--store [ÀɦW]"
 
-#: g10/g10.c:2992
+#: g10/g10.c:2990
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ÀɦW]"
 
-#: g10/g10.c:2994
+#: g10/g10.c:2992
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "¸Ñ±K¥¢±Ñ¡G %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3002
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ÀɦW]"
 
-#: g10/g10.c:3017
+#: g10/g10.c:3015
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ÀɦW]"
 
-#: g10/g10.c:3019
+#: g10/g10.c:3017
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3022
+#: g10/g10.c:3020
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n"
 
-#: g10/g10.c:3040
+#: g10/g10.c:3038
 msgid "--sign [filename]"
 msgstr "--sign [ÀɦW]"
 
-#: g10/g10.c:3053
+#: g10/g10.c:3051
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ÀɦW]"
 
-#: g10/g10.c:3068
+#: g10/g10.c:3066
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ÀɦW]"
 
-#: g10/g10.c:3070
+#: g10/g10.c:3068
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3073
+#: g10/g10.c:3071
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n"
 
-#: g10/g10.c:3093
+#: g10/g10.c:3091
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ÀɦW]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3100
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ÀɦW]"
 
-#: g10/g10.c:3127
+#: g10/g10.c:3125
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ÀɦW]"
 
-#: g10/g10.c:3135
+#: g10/g10.c:3133
 msgid "--sign-key user-id"
 msgstr "--sign-key ¨Ï¥ÎªÌID"
 
-#: g10/g10.c:3139
+#: g10/g10.c:3137
 msgid "--lsign-key user-id"
 msgstr "--lsign-key ¨Ï¥ÎªÌID"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3141
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key ¨Ï¥ÎªÌID"
 
-#: g10/g10.c:3147
+#: g10/g10.c:3145
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key ¨Ï¥ÎªÌID"
 
-#: g10/g10.c:3171
+#: g10/g10.c:3169
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ¨Ï¥ÎªÌID [«ü¥O]"
 
-#: g10/g10.c:3242
+#: g10/g10.c:3240
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [¨Ï¥ÎªÌID] [Æ_°Í°é]"
 
-#: g10/g10.c:3279
+#: g10/g10.c:3277
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n"
 
-#: g10/g10.c:3281
+#: g10/g10.c:3279
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n"
 
-#: g10/g10.c:3283
+#: g10/g10.c:3281
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n"
 
-#: g10/g10.c:3294
+#: g10/g10.c:3292
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n"
 
-#: g10/g10.c:3304
+#: g10/g10.c:3302
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "§ó·s¨pÆ_¥¢±Ñ¡G %s\n"
 
-#: g10/g10.c:3345
+#: g10/g10.c:3343
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "¸Ñ¶}«Ê¸Ë¥¢±Ñ¡G %s\n"
 
-#: g10/g10.c:3353
+#: g10/g10.c:3351
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "¶i¦æ«Ê¸Ë¥¢±Ñ¡G %s\n"
 
-#: g10/g10.c:3440
+#: g10/g10.c:3438
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "µL®Äªº `%s' Âø´êºtºâªk\n"
 
-#: g10/g10.c:3563
+#: g10/g10.c:3561
 msgid "[filename]"
 msgstr "[ÀɦW]"
 
-#: g10/g10.c:3567
+#: g10/g10.c:3565
 msgid "Go ahead and type your message ...\n"
 msgstr "½Ð¶}©lÁä¤J©pªº°T®§ ...\n"
 
-#: g10/g10.c:3857
+#: g10/g10.c:3855
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "¼Ð°O¦WºÙ¤@©w­n±Ä¥Î¥i¦L¥Xªº¦r²Å©ÎªÅ¥Õ¡A¨Ã¥H¤@­Ó¡u=¡v¨Óµ²§À\n"
 
-#: g10/g10.c:3865
+#: g10/g10.c:3863
 msgid "a user notation name must contain the '@' character\n"
 msgstr "¨Ï¥ÎªÌ¼Ð°O¦WºÙ¤@©w­n§t¦³¡u@¡v¦r²Å\n"
 
-#: g10/g10.c:3875
+#: g10/g10.c:3873
 msgid "a notation value must not use any control characters\n"
 msgstr "¼Ð°O­È¤@©w¤£¯à¨Ï¥Î¥ô¦óªº±±¨î¦r²Å\n"
 
-#: g10/g10.c:3909
+#: g10/g10.c:3907
 msgid "the given certification policy URL is invalid\n"
 msgstr "µ¹©wªºªº¾ÌÃÒ­ì«h URL µL®Ä\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3909
 msgid "the given signature policy URL is invalid\n"
 msgstr "µ¹©wªºÃ±³¹­ì«h URL µL®Ä\n"
 
-#: g10/g10.c:3944
+#: g10/g10.c:3942
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "µ¹©wªºÃ±³¹­ì«h URL µL®Ä\n"
@@ -2547,12 +2470,12 @@
 msgstr "¨Ï¥ÎªÌ ID \"%s\" ¤w¸g³QºM¾P¤F¡C"
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1486
+#: g10/keyedit.c:857 g10/keyedit.c:1487
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "©p¤´µM·Q­nñ¸p¥¦¶Ü¡H (y/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1493
 msgid "  Unable to sign.\n"
 msgstr "  µLªkñ¸p¡C\n"
 
@@ -2750,7 +2673,7 @@
 msgid "Really sign? (y/N) "
 msgstr "¯uªº­nñ¸p¶Ü¡H "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
+#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2803,18 +2726,10 @@
 msgstr "¥¿¦b§âª÷Æ_ªºÃ±³¹·h²¾¨ì¥¿½Tªº¦ì¸m¥h\n"
 
 #: g10/keyedit.c:1247
-msgid "save"
-msgstr "save"
-
-#: g10/keyedit.c:1247
 msgid "save and quit"
 msgstr "Àx¦s¨ÃÂ÷¶}"
 
 #: g10/keyedit.c:1250
-msgid "fpr"
-msgstr "fpr"
-
-#: g10/keyedit.c:1250
 msgid "show fingerprint"
 msgstr "Åã¥Ü«ü¯¾"
 
@@ -2823,504 +2738,357 @@
 msgstr "¦C¥Xª÷Æ_©M¨Ï¥ÎªÌ ID"
 
 #: g10/keyedit.c:1253
-msgid "uid"
-msgstr "uid"
-
-#: g10/keyedit.c:1253
 msgid "select user ID N"
 msgstr "¨Ï¥ÎªÌ ID ¿ï¤F N"
 
 #: g10/keyedit.c:1254
-msgid "key"
-msgstr "key"
-
-#: g10/keyedit.c:1254
 msgid "select secondary key N"
 msgstr "¿ï¾Ü¦¸Æ_ N"
 
 #: g10/keyedit.c:1255
-msgid "check"
-msgstr "check"
-
-#: g10/keyedit.c:1255
 msgid "list signatures"
 msgstr "¦C¥Xñ³¹"
 
-#: g10/keyedit.c:1256
-msgid "c"
-msgstr "c"
-
-#: g10/keyedit.c:1257
-msgid "sign"
-msgstr "sign"
-
 #: g10/keyedit.c:1257
 msgid "sign the key"
 msgstr "ñ¸pª÷Æ_"
 
-#: g10/keyedit.c:1258
-msgid "s"
-msgstr "s"
-
-#: g10/keyedit.c:1259
-#, fuzzy
-msgid "tsign"
-msgstr "sign"
-
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
 msgstr "«Ø¥ß¤@¥÷¤ÀÂ÷¦¡Ã±³¹"
 
 #: g10/keyedit.c:1260
-msgid "lsign"
-msgstr "lsign"
-
-#: g10/keyedit.c:1260
 msgid "sign the key locally"
 msgstr "¶È¦b¥»¦añ¸pª÷Æ_"
 
 #: g10/keyedit.c:1261
-msgid "nrsign"
-msgstr "nrsign"
-
-#: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
 msgstr "¥H¤£¥iºM¾P¼Ò¦¡Ã±¸pª÷Æ_"
 
 #: g10/keyedit.c:1262
-msgid "nrlsign"
-msgstr "nrlsign"
-
-#: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
 msgstr "¥H¤£¥iºM¾P¼Ò¦¡¦b¥»¦añ¸pª÷Æ_"
 
-#: g10/keyedit.c:1264
-msgid "adduid"
-msgstr "adduid"
-
-#: g10/keyedit.c:1264
+#: g10/keyedit.c:1265
 msgid "add a user ID"
 msgstr "¼W¥[¤@­Ó¨Ï¥ÎªÌ ID"
 
-#: g10/keyedit.c:1265
-msgid "addphoto"
-msgstr "addphoto"
-
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "add a photo ID"
 msgstr "¼W¥[¤@­Ó·Ó¤ù ID"
 
-#: g10/keyedit.c:1266
-msgid "deluid"
-msgstr "deluid"
-
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1267
 msgid "delete user ID"
 msgstr "§R°£¤@­Ó¨Ï¥ÎªÌ ID"
 
-#: g10/keyedit.c:1268
-msgid "delphoto"
-msgstr "delphoto"
-
-#: g10/keyedit.c:1269
-msgid "addkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "add a secondary key"
 msgstr "¼W¥[¤@§â¦¸Æ_"
 
-#: g10/keyedit.c:1271
-#, fuzzy
-msgid "addcardkey"
-msgstr "addkey"
-
-#: g10/keyedit.c:1271
-msgid "add a key to a smartcard"
-msgstr ""
-
 #: g10/keyedit.c:1272
-msgid "keytocard"
+msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1274
-msgid "delkey"
-msgstr "delkey"
-
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "delete a secondary key"
 msgstr "§R°£¤@§â¦¸Æ_"
 
-#: g10/keyedit.c:1275
-msgid "addrevoker"
-msgstr "addrevoker"
-
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1276
 msgid "add a revocation key"
 msgstr "¼W¥[¤@§âºM¾Pª÷Æ_"
 
-#: g10/keyedit.c:1276
-msgid "delsig"
-msgstr "delsig"
-
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1277
 msgid "delete signatures"
 msgstr "§R°£Ã±³¹"
 
-#: g10/keyedit.c:1277
-msgid "expire"
-msgstr "expire"
-
-#: g10/keyedit.c:1277
+#: g10/keyedit.c:1278
 msgid "change the expire date"
 msgstr "§ó§ï¨Ï¥Î´Á­­"
 
-#: g10/keyedit.c:1278
-msgid "primary"
-msgstr "primary"
-
-#: g10/keyedit.c:1278
+#: g10/keyedit.c:1279
 msgid "flag user ID as primary"
 msgstr "§â¨Ï¥ÎªÌ ID ¼Ð°O¬°¥D­n"
 
-#: g10/keyedit.c:1279
-msgid "toggle"
-msgstr "toggle"
-
-#: g10/keyedit.c:1279
+#: g10/keyedit.c:1280
 msgid "toggle between secret and public key listing"
 msgstr "§â¨pÆ_©M¤½Æ_²M³æô¦b¤@°_"
 
-#: g10/keyedit.c:1281
-msgid "t"
-msgstr "t"
-
-#: g10/keyedit.c:1282
-msgid "pref"
-msgstr "pref"
-
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1283
 msgid "list preferences (expert)"
 msgstr "¦C¥X°¾¦n (±M®a¼Ò¦¡)"
 
-#: g10/keyedit.c:1283
-msgid "showpref"
-msgstr "showpref"
-
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1284
 msgid "list preferences (verbose)"
 msgstr "¦C¥X°¾¦n (Åo­ö¼Ò¦¡)"
 
-#: g10/keyedit.c:1284
-msgid "setpref"
-msgstr "setpref"
-
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1285
 msgid "set preference list"
 msgstr "³]©w°¾¦n²M³æ"
 
-#: g10/keyedit.c:1285
-msgid "updpref"
-msgstr "updpref"
-
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "updated preferences"
 msgstr "§ó·s¹Lªº°¾¦n"
 
-#: g10/keyedit.c:1286
-#, fuzzy
-msgid "keyserver"
-msgstr "ª÷Æ_¦øªA¾¹¿ù»~"
-
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "set preferred keyserver URL"
 msgstr "µLªk¤ÀªRª÷Æ_¦øªA¾¹ URI\n"
 
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1288
 msgid "change the passphrase"
 msgstr "§ó§ï±K½X¦ê"
 
-#: g10/keyedit.c:1288
-msgid "trust"
-msgstr "trust"
-
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "change the ownertrust"
 msgstr "§ó§ï¥DÆ[«H¥ô"
 
-#: g10/keyedit.c:1289
-msgid "revsig"
-msgstr "revsig"
-
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1290
 msgid "revoke signatures"
 msgstr "ºM¾Pñ³¹"
 
-#: g10/keyedit.c:1290
-msgid "revuid"
-msgstr "revuid"
-
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "revoke a user ID"
 msgstr "ºM¾P¤@­Ó¨Ï¥ÎªÌ ID"
 
-#: g10/keyedit.c:1291
-msgid "revkey"
-msgstr "revkey"
-
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1292
 msgid "revoke a secondary key"
 msgstr "ºM¾P¤@§â¦¸Æ_"
 
-#: g10/keyedit.c:1292
-msgid "disable"
-msgstr "disable"
-
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "disable a key"
 msgstr "¸T¥Î¤@§âª÷Æ_"
 
-#: g10/keyedit.c:1293
-msgid "enable"
-msgstr "enable"
-
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "enable a key"
 msgstr "±Ò¥Î¤@§âª÷Æ_"
 
-#: g10/keyedit.c:1294
-msgid "showphoto"
-msgstr "showphoto"
-
-#: g10/keyedit.c:1294
+#: g10/keyedit.c:1295
 msgid "show photo ID"
 msgstr "Åã¥Ü·Ó¤ù ID"
 
-#: g10/keyedit.c:1347
+#: g10/keyedit.c:1348
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Ū¨úª÷Æ_°Ï¶ô `%s' ®Éµo¥Í¿ù»~¡G %s\n"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1366
 msgid "Secret key is available.\n"
 msgstr "¨pÆ_¥i¥Î¡C\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1428
 msgid "Need the secret key to do this.\n"
 msgstr "­n¦³¨pÆ_Åׯà³o»ò°µ¡C\n"
 
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1433
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "½Ð¥ý¨Ï¥Î \"toggle\" «ü¥O¡C\n"
 
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1481
 msgid "Key is revoked."
 msgstr "ª÷Æ_¤w¸g³QºM¾P¤F¡C"
 
-#: g10/keyedit.c:1500
+#: g10/keyedit.c:1501
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "¯uªº­nñ¸p©Ò¦³ªº¨Ï¥ÎªÌ ID ¶Ü¡H "
 
-#: g10/keyedit.c:1502
+#: g10/keyedit.c:1503
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "´£¥Ü¡G¿ï¾Ü­nñ¸pªº¨Ï¥ÎªÌ ID\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1528
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "¦b %s ¼Ò¦¡¤¤¤£¤¹³\¨Ï¥Î³o­Ó«ü¥O¡C\n"
 
-#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
+#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673
 msgid "You must select at least one user ID.\n"
 msgstr "©p¦Ü¤Ö±o¿ï¾Ü¤@­Ó¨Ï¥ÎªÌ ID ¡C\n"
 
-#: g10/keyedit.c:1551
+#: g10/keyedit.c:1552
 msgid "You can't delete the last user ID!\n"
 msgstr "©p¤£¯à§R°£³Ì«á¤@­Ó¨Ï¥ÎªÌ ID ¡I\n"
 
-#: g10/keyedit.c:1553
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "¯uªº­n²¾°£©Ò¦³³Q¿ï¾Üªº¨Ï¥ÎªÌ ID ¶Ü¡H "
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1555
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "¯uªº­n²¾°£³o­Ó¨Ï¥ÎªÌ ID ¶Ü¡H "
 
-#: g10/keyedit.c:1604
+#: g10/keyedit.c:1605
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "¯uªº­n²¾°£³o­Ó¨Ï¥ÎªÌ ID ¶Ü¡H "
 
-#: g10/keyedit.c:1616
+#: g10/keyedit.c:1617
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "©p¦Ü¤Ö¥²¶·¿ï¾Ü¤@§âª÷Æ_¡C\n"
 
-#: g10/keyedit.c:1636 g10/keyedit.c:1691
+#: g10/keyedit.c:1637 g10/keyedit.c:1692
 msgid "You must select at least one key.\n"
 msgstr "©p¦Ü¤Ö¥²¶·¿ï¾Ü¤@§âª÷Æ_¡C\n"
 
-#: g10/keyedit.c:1639
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "©p¯uªº·Q­n§R°£³Q¿ï¾Üªºª÷Æ_¶Ü¡H "
 
-#: g10/keyedit.c:1640
+#: g10/keyedit.c:1641
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "©p¯uªº­n§R°£³o§âª÷Æ_¶Ü¡H "
 
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "¯uªº­nºM¾P©Ò¦³³Q¿ï¾Üªº¨Ï¥ÎªÌ ID ¶Ü¡H "
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1677
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "¯uªº­nºM¾P³o­Ó¨Ï¥ÎªÌ ID ¶Ü¡H "
 
-#: g10/keyedit.c:1695
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "©p¯uªº·Q­nºM¾P³o¨Ç³Q¿ï¾Üªºª÷Æ_¶Ü¡H "
 
-#: g10/keyedit.c:1696
+#: g10/keyedit.c:1697
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "©p¯uªº·Q­nºM¾P³o§âª÷Æ_¶Ü¡H "
 
-#: g10/keyedit.c:1735
+#: g10/keyedit.c:1736
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1768
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "³]©w°¾¦n²M³æ"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "¯uªº­n§ó·s³Q¿ï¾Ü¨Ï¥ÎªÌ ID ªº°¾¦n¶Ü¡H "
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1776
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "¯uªº­n§ó·s°¾¦n¶Ü¡H "
 
-#: g10/keyedit.c:1825
+#: g10/keyedit.c:1826
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "­nÀx¦sÅܧó¶Ü¡H "
 
-#: g10/keyedit.c:1828
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "­n¤£Àx¦s¦ÓÂ÷¶}¶Ü¡H "
 
-#: g10/keyedit.c:1838
+#: g10/keyedit.c:1839
 #, c-format
 msgid "update failed: %s\n"
 msgstr "§ó·s¥¢±Ñ¡G %s\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:1846
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "§ó·s¨pÆ_¥¢±Ñ¡G %s\n"
 
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:1853
 msgid "Key not changed so no update needed.\n"
 msgstr "ª÷Æ_¨S¦³Åܧó©Ò¥H¤£»Ý­n§ó·s¡C\n"
 
-#: g10/keyedit.c:1924
+#: g10/keyedit.c:1925
 msgid "Digest: "
 msgstr "ºK­n¡G "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Features: "
 msgstr "¯SÂI¡G "
 
-#: g10/keyedit.c:1987
+#: g10/keyedit.c:1988
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2002 g10/keylist.c:244
+#: g10/keyedit.c:2003 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2245
+#: g10/keyedit.c:2246
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "³o§âª÷Æ_¥i¯à³Q %s ª÷Æ_ºM¾P¤F "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2252
 #, fuzzy
 msgid "(sensitive)"
 msgstr " ¡]¾÷±Kªº¡^"
 
-#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
+#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "µLªk«Ø¥ß %s: %s\n"
 
-#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[¤wºM¾P]"
 
-#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [¦³®Ä´Á­­¡G %s]"
 
-#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [¦³®Ä´Á­­¡G %s]"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2277
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " «H¥ô¡G %c/%c"
 
-#: g10/keyedit.c:2291
+#: g10/keyedit.c:2292
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " «H¥ô¡G %c/%c"
 
-#: g10/keyedit.c:2295
+#: g10/keyedit.c:2296
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2302
+#: g10/keyedit.c:2303
 msgid "This key has been disabled"
 msgstr "³o§âª÷Æ_¤w¸g³Q¸T¥Î¤F"
 
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2331
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2397
+#: g10/keyedit.c:2398
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x «¬ºAªº¨Ï¥ÎªÌ ID ¨S¦³°¾¦n¡C\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3328,25 +3096,25 @@
 "½Ðª`·NÅã¥Ü¥X¨Óªºª÷Æ_¦³®Ä©Ê¤£»Ý­n§ó¥¿¡A\n"
 "°£«D©p­«·s°õ¦æµ{¦¡¡C\n"
 
-#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
-#: g10/trustdb.c:1162
+#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1163
 #, fuzzy
 msgid "revoked"
 msgstr "[¤wºM¾P]"
 
-#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
-#: g10/trustdb.c:529
+#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:530
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2536
+#: g10/keyedit.c:2537
 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:2596
+#: g10/keyedit.c:2597
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3355,45 +3123,45 @@
 "ĵ§i¡G³o¬O¤@§â PGP2 «¬ºAªºª÷Æ_¡C\n"
 "      ¼W¥[·Ó¤ù ID ¥i¯à·|¾É­P¬Y¨Çª©¥»ªº PGP »é¦^³o§âª÷Æ_¡C\n"
 
-#: g10/keyedit.c:2601 g10/keyedit.c:2879
+#: g10/keyedit.c:2602 g10/keyedit.c:2880
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "©p½T©w¤´µM·Q­n¼W¥[¶Ü¡H (y/N) "
 
-#: g10/keyedit.c:2607
+#: g10/keyedit.c:2608
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "©p¤£¥i¥H§â·Ó¤ù ID ¼W¥[¨ì PGP2 «¬ºAªºª÷Æ_¸Ì¡C\n"
 
-#: g10/keyedit.c:2747
+#: g10/keyedit.c:2748
 msgid "Delete this good signature? (y/N/q)"
 msgstr "§R°£³o­Ó§¹¦nªºÃ±³¹¶Ü¡H (y/N/q)"
 
-#: g10/keyedit.c:2757
+#: g10/keyedit.c:2758
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "§R°£³o­ÓµL®ÄªºÃ±³¹¶Ü¡H (y/N/q)"
 
-#: g10/keyedit.c:2761
+#: g10/keyedit.c:2762
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "§R°£³o­Ó¥¼ª¾ªºÃ±³¹¶Ü¡H (y/N/q)"
 
-#: g10/keyedit.c:2767
+#: g10/keyedit.c:2768
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¯uªº­n§R°£³o­Ó¦Û§Úñ³¹¶Ü¡H (y/N)"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "¤w¸g§R°£¤F %d ­Óñ³¹¡C\n"
 
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2783
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "¤w¸g§R°£¤F %d ­Óñ³¹¡C\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2786
 msgid "Nothing deleted.\n"
 msgstr "¨S¦³ªF¦è³Q§R°£¡C\n"
 
-#: g10/keyedit.c:2874
+#: g10/keyedit.c:2875
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3402,159 +3170,159 @@
 "ĵ§i¡G³o¬O¤@§â PGP2 «¬ºAªºª÷Æ_¡C\n"
 "      ¼W¥[«ü©wºM¾PªÌ¥i¯à·|¾É­P¬Y¨Çª©¥»ªº PGP »é¦^³o§âª÷Æ_¡C\n"
 
-#: g10/keyedit.c:2885
+#: g10/keyedit.c:2886
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "©p¤£¥i¥H§â«ü©wºM¾PªÌ¼W¥[¨ì PGP2 «¬ºAªºª÷Æ_¸Ì¡C\n"
 
-#: g10/keyedit.c:2905
+#: g10/keyedit.c:2906
 msgid "Enter the user ID of the designated revoker: "
 msgstr "¿é¤J«ü©wºM¾PªÌªº¨Ï¥ÎªÌ ID ¡G "
 
-#: g10/keyedit.c:2928
+#: g10/keyedit.c:2929
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "µLªk±N PGP 2.x «¬ºAªºª÷Æ_«ü¬£¬°«ü©wºM¾PªÌ\n"
 
-#: g10/keyedit.c:2943
+#: g10/keyedit.c:2944
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "©p¤£¯à«ü¬£¬Y§âª÷Æ_¬°¥¦¦Û¤vªº«ü©wºM¾PªÌ\n"
 
-#: g10/keyedit.c:2965
+#: g10/keyedit.c:2966
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "ĵ§i¡G³o§âª÷Æ_¤w¸g³Q¥¦ªº«ù¦³¤HºM¾P¤F¡I\n"
 
-#: g10/keyedit.c:2984
+#: g10/keyedit.c:2985
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ĵ§i¡G¤@¥¹§â¬Y§âª÷Æ_«ü¬£¬°«ü©wºM¾PªÌ«á¡A´NµLªk¤Ï®¬¤F¡I\n"
 
-#: g10/keyedit.c:2990
+#: g10/keyedit.c:2991
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "©p½T©w­n«ü¬£³o§âª÷Æ_¬°«ü©wºM¾PªÌ¶Ü¡H (y/N): "
 
-#: g10/keyedit.c:3051
+#: g10/keyedit.c:3052
 msgid "Please remove selections from the secret keys.\n"
 msgstr "½Ð±q¨pÆ_¤¤²¾°£¿ï¾Ü¡C\n"
 
-#: g10/keyedit.c:3057
+#: g10/keyedit.c:3058
 msgid "Please select at most one secondary key.\n"
 msgstr "½Ð¦Ü¦h¿ï¾Ü¤@§â¦¸Æ_¡C\n"
 
-#: g10/keyedit.c:3061
+#: g10/keyedit.c:3062
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "¥¿¦bÅܧó¬Y§â¦¸Æ_ªº¨Ï¥Î´Á­­¡C\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3065
 msgid "Changing expiration time for the primary key.\n"
 msgstr "¥¿¦bÅܧó¥DÆ_ªº¨Ï¥Î´Á­­¡C\n"
 
-#: g10/keyedit.c:3110
+#: g10/keyedit.c:3111
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "©p¤£¯àÅܧó v3 ª÷Æ_ªº¨Ï¥Î´Á­­\n"
 
-#: g10/keyedit.c:3126
+#: g10/keyedit.c:3127
 msgid "No corresponding signature in secret ring\n"
 msgstr "¦b¨pÆ_°é¸Ì¨S¦³¤@­PªºÃ±³¹\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 msgid "Please select exactly one user ID.\n"
 msgstr "½Ðºë½T¦a¿ï¾Ü¤@­Ó¨Ï¥ÎªÌ ID ¡C\n"
 
-#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "¥¿¦b¨Ï¥ÎªÌ ID \"%s\" ¸õ¹L v3 ¦Û§Úñ³¹\n"
 
-#: g10/keyedit.c:3416
+#: g10/keyedit.c:3417
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "©p½T©w­n¥Î¥¦¶Ü¡H (y/N) "
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3497
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "©p½T©w­n¥Î¥¦¶Ü¡H (y/N) "
 
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3559
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "¯Á¤Þ %d ¨S¦³¨Ï¥ÎªÌ ID\n"
 
-#: g10/keyedit.c:3604
+#: g10/keyedit.c:3605
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "¯Á¤Þ %d ¨S¦³¦¸Æ_\n"
 
-#: g10/keyedit.c:3721
+#: g10/keyedit.c:3722
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "¨Ï¥ÎªÌ ID¡G \""
 
-#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ¥Ñ %08lX ñ¸p©ó %s%s%s\n"
 
-#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 msgid " (non-exportable)"
 msgstr " (¤£¥i¶×¥X)"
 
-#: g10/keyedit.c:3730
+#: g10/keyedit.c:3731
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "³o¥÷ñ¸p¤w¸g¦b %s ¹L´Á¤F¡C\n"
 
-#: g10/keyedit.c:3734
+#: g10/keyedit.c:3735
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "©p½T©w©p¤´µM·Q­nºM¾P¥¦¶Ü¡H (y/N) "
 
-#: g10/keyedit.c:3738
+#: g10/keyedit.c:3739
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "­n¬°³o¥÷ñ³¹«Ø¥ß¤@¥÷ºM¾P¾ÌÃҶܡH (y/N) "
 
-#: g10/keyedit.c:3765
+#: g10/keyedit.c:3766
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "©p¤w¸gñ¸p¤F³o¨Ç¨Ï¥ÎªÌ ID¡G \n"
 
-#: g10/keyedit.c:3791
+#: g10/keyedit.c:3792
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (¤£¥i¶×¥X)"
 
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3799
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ¥Ñ %08lX ºM¾P©ó %s\n"
 
-#: g10/keyedit.c:3820
+#: g10/keyedit.c:3821
 msgid "You are about to revoke these signatures:\n"
 msgstr "©p¥¿¦bºM¾P³o¨Çñ³¹¡G\n"
 
-#: g10/keyedit.c:3840
+#: g10/keyedit.c:3841
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¯uªº­n«Ø¥ßºM¾P¾ÌÃҶܡH (y/N) "
 
-#: g10/keyedit.c:3870
+#: g10/keyedit.c:3871
 msgid "no secret key\n"
 msgstr "¨S¦³¨pÆ_\n"
 
-#: g10/keyedit.c:3940
+#: g10/keyedit.c:3941
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "¨Ï¥ÎªÌ ID \"%s\" ¤w¸g³QºM¾P¤F¡C\n"
 
-#: g10/keyedit.c:3957
+#: g10/keyedit.c:3958
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ĵ§i¡G¦³¤@¥÷¨Ï¥ÎªÌ ID ñ³¹ªº¤é´Á¼Ð°O¬° %d ¬í«áªº¥¼¨Ó\n"
 
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4127
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "¥¿¦bÅã¥Ü %s ¤Ø¤o¬° %ld ªºª÷Æ_ 0x%08lX (uid %d) ªº·Ó¤ù ID\n"
@@ -3881,7 +3649,7 @@
 "©p»Ý­n¤@­Ó±K½X¦ê¨Ó«OÅ@©pªº¨pÆ_¡C\n"
 "\n"
 
-#: g10/keygen.c:1819 g10/passphrase.c:1099
+#: g10/keygen.c:1819 g10/passphrase.c:1102
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4138,7 +3906,7 @@
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:662 g10/keyserver.c:1142
+#: g10/keyserver.c:662 g10/keyserver.c:1147
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "µL®Äªº¶×¥X¿ï¶µ\n"
@@ -4153,106 +3921,106 @@
 msgid "key not found on keyserver\n"
 msgstr "§ä¤£¨ì `%s' ª÷Æ_¡G %s\n"
 
-#: g10/keyserver.c:896
+#: g10/keyserver.c:901
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "ª÷Æ_ %08lX ¥¿¦V %s ­n¨D¤¤\n"
 
-#: g10/keyserver.c:900
+#: g10/keyserver.c:905
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "ª÷Æ_ %08lX ¥¿¦V %s ­n¨D¤¤\n"
 
-#: g10/keyserver.c:1045
+#: g10/keyserver.c:1050
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "¥¿¦b·j´M \"%s\" ©ó HKP ¦øªA¾¹ %s ¤W\n"
 
-#: g10/keyserver.c:1049
+#: g10/keyserver.c:1054
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "¤w¸g³Q©pªºª÷Æ_ %08lX ñ¸p©ó %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1097
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "¥¿¦b·j´M \"%s\" ©ó HKP ¦øªA¾¹ %s ¤W\n"
 
-#: g10/keyserver.c:1095
+#: g10/keyserver.c:1100
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "¥¿¦b·j´M \"%s\" ©ó HKP ¦øªA¾¹ %s ¤W\n"
 
-#: g10/keyserver.c:1102 g10/keyserver.c:1197
+#: g10/keyserver.c:1107 g10/keyserver.c:1202
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "µL®Äªº¶×¥X¿ï¶µ\n"
 
-#: g10/keyserver.c:1150
+#: g10/keyserver.c:1155
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1164
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1218
+#: g10/keyserver.c:1223
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1229
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1236
+#: g10/keyserver.c:1241
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1246
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1254
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1261
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "ª÷Æ_¦øªA¾¹¿ù»~"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1266
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "ª÷Æ_¦øªA¾¹¿ù»~"
 
-#: g10/keyserver.c:1268
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n"
 
-#: g10/keyserver.c:1293 g10/keyserver.c:1327
+#: g10/keyserver.c:1300 g10/keyserver.c:1334
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1578
+#: g10/keyserver.c:1585
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ĵ§i¡GµLªk²¾°£¼È¦sÀÉ (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1600
+#: g10/keyserver.c:1607
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "ª÷Æ_ %08lX ¥¿¦V %s ­n¨D¤¤\n"
 
-#: g10/keyserver.c:1602
+#: g10/keyserver.c:1609
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "ª÷Æ_ %08lX ¥¿¦V %s ­n¨D¤¤\n"
@@ -4431,7 +4199,7 @@
 msgid "textmode"
 msgstr "¤å¦r¼Ò¦¡"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:528
+#: g10/mainproc.c:1672 g10/trustdb.c:529
 msgid "unknown"
 msgstr "¥¼ª¾"
 
@@ -4603,50 +4371,50 @@
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d Ãþ§Oªº¤l«Ê¥]³]©w¤FÃöÁä¦ì¤¸\n"
 
-#: g10/passphrase.c:475 g10/passphrase.c:522
+#: g10/passphrase.c:478 g10/passphrase.c:525
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ¦b¦¹¶¥¬qµLªk¨Ï¥Î\n"
 
-#: g10/passphrase.c:483
+#: g10/passphrase.c:486
 msgid "can't set client pid for the agent\n"
 msgstr "µLªk³]©w¥N²zµ{¦¡¤¤ªº¨Ï¥ÎªÌºÝ pid\n"
 
-#: g10/passphrase.c:491
+#: g10/passphrase.c:494
 msgid "can't get server read FD for the agent\n"
 msgstr "µLªk¨ú±o¥N²zµ{¦¡©Ò»Ýªº¦øªA¾¹Åª¨úÀÉ®×´y­z\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:501
 msgid "can't get server write FD for the agent\n"
 msgstr "µLªk¨ú±o¥N²zµ{¦¡©Ò»Ýªº¦øªA¾¹¼g¤JÀÉ®×´y­z\n"
 
-#: g10/passphrase.c:531
+#: g10/passphrase.c:534
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "³QÅܳyªº GPG_AGENT_INFO Àô¹ÒÅܼÆ\n"
 
-#: g10/passphrase.c:544
+#: g10/passphrase.c:547
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent ¨ó©wª©¥» %d ¥¼³Q¤ä´©\n"
 
-#: g10/passphrase.c:565
+#: g10/passphrase.c:568
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "µLªk³s±µ¦Ü `%s' ¡G %s\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:590
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent ªº³q°T°ÝÃD\n"
 
-#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
+#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045
 msgid "problem with the agent - disabling agent use\n"
 msgstr "¥N²zµ{¦¡ªº°ÝÃD ¢w ¥¿¦b°±¥Î¥N²zµ{¦¡\n"
 
-#: g10/passphrase.c:698 g10/passphrase.c:1203
+#: g10/passphrase.c:701 g10/passphrase.c:1206
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (¥D­nª÷Æ_ ID %08lX)"
 
-#: g10/passphrase.c:712
+#: g10/passphrase.c:715
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4657,41 +4425,41 @@
 "\"%.*s\"\n"
 "%u ¦ì¤¸ %s ID %08lX ªºª÷Æ_¡A«Ø¥ß©ó %s%s\n"
 
-#: g10/passphrase.c:737
+#: g10/passphrase.c:740
 msgid "Repeat passphrase\n"
 msgstr "½Ð¦A¿é¤J¤@¦¸±K½X¦ê\n"
 
-#: g10/passphrase.c:739
+#: g10/passphrase.c:742
 msgid "Enter passphrase\n"
 msgstr "½Ð¿é¤J±K½X¦ê\n"
 
-#: g10/passphrase.c:777
+#: g10/passphrase.c:780
 msgid "passphrase too long\n"
 msgstr "±K½X¦ê¤Óªø\n"
 
-#: g10/passphrase.c:790
+#: g10/passphrase.c:793
 msgid "invalid response from agent\n"
 msgstr "¥N²zµ{¦¡¶Ç¦^µL®Äªº¦^À³\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:924
+#: g10/passphrase.c:808 g10/passphrase.c:927
 msgid "cancelled by user\n"
 msgstr "¥Ñ¨Ï¥ÎªÌ¨ú®ø¤F\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:1013
+#: g10/passphrase.c:813 g10/passphrase.c:1016
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "¥N²zµ{¦¡ªº°ÝÃD¡G¥N²zµ{¦¡¶Ç¦^ 0x%lx\n"
 
-#: g10/passphrase.c:1094 g10/passphrase.c:1256
+#: g10/passphrase.c:1097 g10/passphrase.c:1259
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "¦b§å¦¸¼Ò¦¡¤¤µLªk¸ß°Ý±K½X\n"
 
-#: g10/passphrase.c:1101 g10/passphrase.c:1261
+#: g10/passphrase.c:1104 g10/passphrase.c:1264
 msgid "Enter passphrase: "
 msgstr "½Ð¿é¤J±K½X¦ê¡G "
 
-#: g10/passphrase.c:1184
+#: g10/passphrase.c:1187
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4701,17 +4469,17 @@
 "©p»Ý­n¤U¦C¨Ï¥ÎªÌªº±K½X¦ê¡AÅׯà¸Ñ¶}¨pÆ_¡G\n"
 "\""
 
-#: g10/passphrase.c:1190
+#: g10/passphrase.c:1193
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u ¦ì¤¸ %s ID %08lX ªºª÷Æ_¡A«Ø¥ß©ó %s"
 
-#: g10/passphrase.c:1199
+#: g10/passphrase.c:1202
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1265
+#: g10/passphrase.c:1268
 msgid "Repeat passphrase: "
 msgstr "½Ð¦A¿é¤J¤@¦¸±K½X¦ê¡G "
 
@@ -5565,12 +5333,12 @@
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "«H¥ô¸ê®Æ®w·l·´¤F¡F½Ð°õ¦æ \"gpg --fix-trustdb\" ¡C\n"
 
-#: g10/textfilter.c:143
+#: g10/textfilter.c:142
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "µLªk³B²zªø©ó %d ¦r²Åªº¤å¦r¦C\n"
 
-#: g10/textfilter.c:240
+#: g10/textfilter.c:239
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "¿é¤J¦C¤ñ %d ¦r²ÅÁÙªø\n"
@@ -5629,7 +5397,7 @@
 msgid "[ revoked]"
 msgstr "[¤wºM¾P]"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:507 g10/trustdb.c:512
 #, fuzzy
 msgid "[ expired]"
 msgstr "[¤w¹L´Á]"
@@ -5639,101 +5407,101 @@
 msgid "[ unknown]"
 msgstr "¥¼ª¾"
 
-#: g10/trustdb.c:512
+#: g10/trustdb.c:513
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:514
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:515
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:516
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
 #, fuzzy
 msgid "never"
 msgstr "¥Ã»·¤£¹L´Á"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:535
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:574
+#: g10/trustdb.c:575
 msgid "no need for a trustdb check\n"
 msgstr "¤£»Ý­nÀˬd«H¥ô¸ê®Æ®w\n"
 
-#: g10/trustdb.c:580 g10/trustdb.c:2141
+#: g10/trustdb.c:581 g10/trustdb.c:2142
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "¤U¦¸«H¥ô¸ê®Æ®wÀˬd±N©ó %s ¶i¦æ\n"
 
-#: g10/trustdb.c:589
+#: g10/trustdb.c:590
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "¤£»Ý­nÀˬd«H¥ô¸ê®Æ®w\n"
 
-#: g10/trustdb.c:604
+#: g10/trustdb.c:605
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "¤£»Ý­nÀˬd«H¥ô¸ê®Æ®w\n"
 
-#: g10/trustdb.c:822 g10/trustdb.c:1260
+#: g10/trustdb.c:823 g10/trustdb.c:1261
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "¤½Æ_ %08lX ¨S¦³³Q§ä¨ì¡G %s\n"
 
-#: g10/trustdb.c:1017
+#: g10/trustdb.c:1018
 msgid "please do a --check-trustdb\n"
 msgstr "½Ð°µ¤@¦¸ --check-trustdb\n"
 
-#: g10/trustdb.c:1021
+#: g10/trustdb.c:1022
 msgid "checking the trustdb\n"
 msgstr "¥¿¦bÀˬd«H¥ô¸ê®Æ®w\n"
 
-#: g10/trustdb.c:1885
+#: g10/trustdb.c:1886
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "¤w¸g³B²z¤F %d §âª÷Æ_¡]¦@­p¤w¸Ñ¨M¤F %d ¥÷¦³®Ä©Ê¡^\n"
 
-#: g10/trustdb.c:1949
+#: g10/trustdb.c:1950
 msgid "no ultimately trusted keys found\n"
 msgstr "¨S¦³§ä¨ì¥ô¦ó¹ý©³«H¥ôªºª÷Æ_\n"
 
-#: g10/trustdb.c:1963
+#: g10/trustdb.c:1964
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "¹ý©³«H¥ôª÷Æ_ %08lX ªº¤½Æ_¨S¦³³Q§ä¨ì\n"
 
-#: g10/trustdb.c:1986
+#: g10/trustdb.c:1987
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2072
+#: g10/trustdb.c:2073
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2147
+#: g10/trustdb.c:2148
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "«H¥ô°O¿ý %lu ¡AÃþ§O %d: ¼g¤J¥¢±Ñ¡G %s\n"
@@ -6006,6 +5774,10 @@
 msgid "nN"
 msgstr "nN"
 
+#: util/miscutil.c:348
+msgid "quit"
+msgstr "quit"
+
 #: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
@@ -6043,6 +5815,158 @@
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(¤]³\©p¿ï¿ùµ{¦¡¨Ó°µ³o¥ó¨Æ¤F)\n"
 
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "list"
+#~ msgstr "list"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "debug"
+#~ msgstr "debug"
+
+#, fuzzy
+#~ msgid "name"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "login"
+#~ msgstr "lsign"
+
+#, fuzzy
+#~ msgid "cafpr"
+#~ msgstr "fpr"
+
+#, fuzzy
+#~ msgid "forcesig"
+#~ msgstr "revsig"
+
+#, fuzzy
+#~ msgid "generate"
+#~ msgstr "¤@¯ë©Ê¿ù»~"
+
+#~ msgid "passwd"
+#~ msgstr "passwd"
+
+#~ msgid "save"
+#~ msgstr "save"
+
+#~ msgid "fpr"
+#~ msgstr "fpr"
+
+#~ msgid "uid"
+#~ msgstr "uid"
+
+#~ msgid "key"
+#~ msgstr "key"
+
+#~ msgid "check"
+#~ msgstr "check"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "sign"
+#~ msgstr "sign"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#, fuzzy
+#~ msgid "tsign"
+#~ msgstr "sign"
+
+#~ msgid "lsign"
+#~ msgstr "lsign"
+
+#~ msgid "nrsign"
+#~ msgstr "nrsign"
+
+#~ msgid "nrlsign"
+#~ msgstr "nrlsign"
+
+#~ msgid "adduid"
+#~ msgstr "adduid"
+
+#~ msgid "addphoto"
+#~ msgstr "addphoto"
+
+#~ msgid "deluid"
+#~ msgstr "deluid"
+
+#~ msgid "delphoto"
+#~ msgstr "delphoto"
+
+#~ msgid "addkey"
+#~ msgstr "addkey"
+
+#, fuzzy
+#~ msgid "addcardkey"
+#~ msgstr "addkey"
+
+#~ msgid "delkey"
+#~ msgstr "delkey"
+
+#~ msgid "addrevoker"
+#~ msgstr "addrevoker"
+
+#~ msgid "delsig"
+#~ msgstr "delsig"
+
+#~ msgid "expire"
+#~ msgstr "expire"
+
+#~ msgid "primary"
+#~ msgstr "primary"
+
+#~ msgid "toggle"
+#~ msgstr "toggle"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "pref"
+#~ msgstr "pref"
+
+#~ msgid "showpref"
+#~ msgstr "showpref"
+
+#~ msgid "setpref"
+#~ msgstr "setpref"
+
+#~ msgid "updpref"
+#~ msgstr "updpref"
+
+#, fuzzy
+#~ msgid "keyserver"
+#~ msgstr "ª÷Æ_¦øªA¾¹¿ù»~"
+
+#~ msgid "trust"
+#~ msgstr "trust"
+
+#~ msgid "revsig"
+#~ msgstr "revsig"
+
+#~ msgid "revuid"
+#~ msgstr "revuid"
+
+#~ msgid "revkey"
+#~ msgstr "revkey"
+
+#~ msgid "disable"
+#~ msgstr "disable"
+
+#~ msgid "enable"
+#~ msgstr "enable"
+
+#~ msgid "showphoto"
+#~ msgstr "showphoto"
+
 #~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr "`%s' ºK­nºtºâªk¦b³o¦¸ÄÀ¥Xªºª©¥»¤¤°ßŪ\n"
 
Index: gnupg/scripts/depcomp
diff -u gnupg/scripts/depcomp:1.2 gnupg/scripts/depcomp:1.3
--- gnupg/scripts/depcomp:1.2	Fri Oct  1 12:11:26 2004
+++ gnupg/scripts/depcomp	Tue Dec 14 08:49:27 2004
@@ -1,7 +1,9 @@
 #! /bin/sh
-
 # depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000, 2003 Free Software Foundation, Inc.
+
+scriptversion=2004-05-31.23
+
+# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,22 +27,45 @@
 
 # Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
 
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputing dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake at gnu.org>.
+EOF
+    exit 0
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit 0
+    ;;
+esac
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
 fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
-   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
-   dir=`echo "$object" | sed 's,/.*$,/,'`
-   if test "$dir" = "$object"; then
-      dir=
-   fi
-   # FIXME: should be _deps on DOS.
-   depfile="$dir.deps/$base"
-fi
 
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
@@ -262,26 +287,35 @@
    base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
    if test "$libtool" = yes; then
+      # Dependencies are output in .lo.d with libtool 1.4.
+      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
+      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
+      # latter, because the former will be cleaned when $dir.libs is
+      # erased.
       tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir.libs/$base.d"
+      tmpdepfile2="$dir$base.o.d"
+      tmpdepfile3="$dir.libs/$base.d"
       "$@" -Wc,-MD
    else
       tmpdepfile1="$dir$base.o.d"
       tmpdepfile2="$dir$base.d"
+      tmpdepfile3="$dir$base.d"
       "$@" -MD
    fi
 
    stat=$?
    if test $stat -eq 0; then :
    else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
       exit $stat
    fi
 
    if test -f "$tmpdepfile1"; then
       tmpdepfile="$tmpdepfile1"
-   else
+   elif test -f "$tmpdepfile2"; then
       tmpdepfile="$tmpdepfile2"
+   else
+      tmpdepfile="$tmpdepfile3"
    fi
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
@@ -477,3 +511,12 @@
 esac
 
 exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
Index: gnupg/scripts/install-sh
diff -u gnupg/scripts/install-sh:1.4 gnupg/scripts/install-sh:1.5
--- gnupg/scripts/install-sh:1.4	Fri Oct  1 12:11:26 2004
+++ gnupg/scripts/install-sh	Tue Dec 14 08:49:27 2004
@@ -1,7 +1,8 @@
 #!/bin/sh
-#
 # install - install a program, script, or datafile
-#
+
+scriptversion=2004-10-22.00
+
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
 # following copyright and license.
@@ -41,13 +42,11 @@
 # from scratch.  It can only install one file at a time, a restriction
 # shared with many OS's install programs.
 
-
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
 
-
 # put in absolute paths if you don't have them in your path; or use env. vars.
 
 mvprog="${MVPROG-mv}"
@@ -59,236 +58,266 @@
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
 chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
+chowncmd=
+chgrpcmd=
+stripcmd=
 rmcmd="$rmprog -f"
 mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd=$cpprog
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd=$stripprog
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "$0: no input file specified" >&2
-	exit 1
-else
-	:
-fi
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
+
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+-c         (ignored)
+-d         create directories instead of installing files.
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test -n "$1"; do
+  case $1 in
+    -c) shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit 0;;
+
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
 
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-
-	if [ -d "$dst" ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=$mkdirprog
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f "$src" ] || [ -d "$src" ]
-	then
-		:
-	else
-		echo "$0: $src does not exist" >&2
-		exit 1
-	fi
-
-	if [ x"$dst" = x ]
-	then
-		echo "$0: no destination specified" >&2
-		exit 1
-	else
-		:
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d "$dst" ]
-	then
-		dst=$dst/`basename "$src"`
-	else
-		:
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-	'
-IFS="${IFS-$defaultIFS}"
-
-oIFS=$IFS
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS=$oIFS
-
-pathcomp=''
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
 
-while [ $# -ne 0 ] ; do
-	pathcomp=$pathcomp$1
+    -T) no_target_directory=true
 	shift
+	continue;;
 
-	if [ ! -d "$pathcomp" ] ;
-        then
-		$mkdirprog "$pathcomp"
-	else
-		:
-	fi
+    --version) echo "$0 $scriptversion"; exit 0;;
 
-	pathcomp=$pathcomp/
+    *)  # When -d is used, all remaining arguments are directories to create.
+	# When -t is used, the destination is already specified.
+	test -n "$dir_arg$dstarg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+	for arg
+	do
+          if test -n "$dstarg"; then
+	    # $@ is not empty: it contains at least $arg.
+	    set fnord "$@" "$dstarg"
+	    shift # fnord
+	  fi
+	  shift # arg
+	  dstarg=$arg
+	done
+	break;;
+  esac
 done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd "$dst" &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
 
-	if [ x"$transformarg" = x ]
-	then
-		dstfile=`basename "$dst"`
-	else
-		dstfile=`basename "$dst" $transformbasename |
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ]
-	then
-		dstfile=`basename "$dst"`
-	else
-		:
-	fi
-
-# Make a couple of temp file names in the proper directory.
-
-	dsttmp=$dstdir/_inst.$$_
-	rmtmp=$dstdir/_rm.$$_
-
-# Trap to clean up temp files at exit.
-
-	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-	trap '(exit $?); exit' 1 2 13 15
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd "$src" "$dsttmp" &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
-
-# Now remove or move aside any old file at destination location.  We try this
-# two ways since rm can't unlink itself on some systems and the destination
-# file might be busy for other reasons.  In this case, the final cleanup
-# might fail but the new file should still install successfully.
-
-{
-	if [ -f "$dstdir/$dstfile" ]
-	then
-		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
-		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
-		{
-		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		  (exit 1); exit
-		}
-	else
-		:
-	fi
-} &&
-
-# Now rename the file to the real destination.
+if test -z "$1"; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
 
-	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    src=
+
+    if test -d "$dst"; then
+      mkdircmd=:
+      chmodcmd=
+    else
+      mkdircmd=$mkdirprog
+    fi
+  else
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
+    esac
 
-fi &&
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
+      dst=$dst/`basename "$src"`
+    fi
+  fi
+
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+
+  # Make sure that the destination directory exists.
+
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+	 '
+    IFS="${IFS-$defaultIFS}"
+
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
+    IFS=$oIFS
+
+    pathcomp=
+
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      if test ! -d "$pathcomp"; then
+        $mkdirprog "$pathcomp"
+	# mkdir can fail with a `File exist' error in case several
+	# install-sh are creating the directory concurrently.  This
+	# is OK.
+	test -d "$pathcomp" || exit
+      fi
+      pathcomp=$pathcomp/
+    done
+  fi
+
+  if test -n "$dir_arg"; then
+    $doit $mkdircmd "$dst" \
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+  else
+    dstfile=`basename "$dst"`
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+    trap '(exit $?); exit' 1 2 13 15
+
+    # Copy the file name to the temp name.
+    $doit $cpprog "$src" "$dsttmp" &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dstdir/$dstfile"; then
+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || {
+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 (exit 1); exit
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	 }
+    }
+  fi || { (exit 1); exit; }
+done
 
 # The final little trick to "correctly" pass the exit status to the exit trap.
-
 {
-	(exit 0); exit
+  (exit 0); exit
 }
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
Index: gnupg/scripts/missing
diff -u gnupg/scripts/missing:1.3 gnupg/scripts/missing:1.4
--- gnupg/scripts/missing:1.3	Fri Oct  1 12:11:26 2004
+++ gnupg/scripts/missing	Tue Dec 14 08:49:27 2004
@@ -1,6 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2004-09-07.08
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
+#   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -38,18 +42,24 @@
   configure_ac=configure.in
 fi
 
+msg="missing on your system"
+
 case "$1" in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
   shift
   "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
   ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
 
   -h|--h|--he|--hel|--help)
     echo "\
@@ -74,11 +84,15 @@
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
   tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake at gnu.org>."
+    exit 0
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.4 - GNU automake"
+    echo "missing $scriptversion (GNU Automake)"
+    exit 0
     ;;
 
   -*)
@@ -87,14 +101,44 @@
     exit 1
     ;;
 
-  aclocal*)
+esac
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+  lex|yacc)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
        exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
     fi
+    ;;
+esac
 
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+  aclocal*)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
          to install the \`Automake' and \`Perl' packages.  Grab them from
          any GNU archive site."
@@ -102,13 +146,8 @@
     ;;
 
   autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
          archive site."
@@ -116,13 +155,8 @@
     ;;
 
   autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
          from any GNU archive site."
@@ -140,13 +174,8 @@
     ;;
 
   automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
          You might want to install the \`Automake' and \`Perl' packages.
          Grab them from any GNU archive site."
@@ -156,14 +185,9 @@
     ;;
 
   autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
          proper tools for further handling them.
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
@@ -185,7 +209,7 @@
 
   bison|yacc)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' $msg.  You should only need it if
          you modified a \`.y' file.  You may need the \`Bison' package
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
@@ -215,7 +239,7 @@
 
   lex|flex)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.l' file.  You may need the \`Flex' package
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
@@ -237,13 +261,8 @@
     ;;
 
   help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
@@ -262,13 +281,8 @@
     ;;
 
   makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
          indirectly affecting the aspect of the manual.  The spurious
          call might also be the consequence of using a buggy \`make' (AIX,
@@ -284,10 +298,6 @@
 
   tar)
     shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
 
     # We have already tried tar in the generic part.
     # Look for gnutar/gtar before invocation to avoid ugly error
@@ -323,8 +333,8 @@
 
   *)
     echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
          proper tools for further handling them.  Check the \`README' file,
          it often tells you about the needed prerequisites for installing
          this package.  You may also peek at any GNU archive site, in case
@@ -334,3 +344,10 @@
 esac
 
 exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
Index: gnupg/scripts/mkinstalldirs
diff -u gnupg/scripts/mkinstalldirs:1.6 gnupg/scripts/mkinstalldirs:1.7
--- gnupg/scripts/mkinstalldirs:1.6	Sat Oct 25 18:27:59 2003
+++ gnupg/scripts/mkinstalldirs	Tue Dec 14 08:49:27 2004
@@ -1,20 +1,32 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman at prep.ai.mit.edu>
+
+scriptversion=2004-02-15.20
+
+# Original author: Noah Friedman <friedman at prep.ai.mit.edu>
 # Created: 1993-05-16
-# Public domain
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake at gnu.org> or send patches to
+# <automake-patches at gnu.org>.
 
 errstatus=0
 dirmode=""
 
 usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <bug-automake at gnu.org>."
 
 # process command line arguments
 while test $# -gt 0 ; do
   case $1 in
     -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
+      echo "$usage"
       exit 0
       ;;
     -m)                         # -m PERM arg
@@ -23,6 +35,10 @@
       dirmode=$1
       shift
       ;;
+    --version)
+      echo "$0 $scriptversion"
+      exit 0
+      ;;
     --)                         # stop option processing
       shift
       break
@@ -50,17 +66,37 @@
   0) exit 0 ;;
 esac
 
+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error.  This is a problem when calling mkinstalldirs
+# from a parallel make.  We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
 case $dirmode in
   '')
-    if mkdir -p -- . 2>/dev/null; then
+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
       echo "mkdir -p -- $*"
       exec mkdir -p -- "$@"
+    else
+      # On NextStep and OpenStep, the `mkdir' command does not
+      # recognize any option.  It will interpret all options as
+      # directories to create, and then abort because `.' already
+      # exists.
+      test -d ./-p && rmdir ./-p
+      test -d ./--version && rmdir ./--version
     fi
     ;;
   *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+       test ! -d ./--version; then
       echo "mkdir -m $dirmode -p -- $*"
       exec mkdir -m "$dirmode" -p -- "$@"
+    else
+      # Clean up after NextStep and OpenStep mkdir.
+      for d in ./-m ./-p ./--version "./$dirmode";
+      do
+        test -d $d && rmdir $d
+      done
     fi
     ;;
 esac
@@ -84,17 +120,17 @@
       mkdir "$pathcomp" || lasterr=$?
 
       if test ! -d "$pathcomp"; then
-  	errstatus=$lasterr
+	errstatus=$lasterr
       else
-  	if test ! -z "$dirmode"; then
+	if test ! -z "$dirmode"; then
 	  echo "chmod $dirmode $pathcomp"
-    	  lasterr=""
-  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
+	  lasterr=""
+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
 
-  	  if test ! -z "$lasterr"; then
-  	    errstatus=$lasterr
-  	  fi
-  	fi
+	  if test ! -z "$lasterr"; then
+	    errstatus=$lasterr
+	  fi
+	fi
       fi
     fi
 
@@ -107,5 +143,8 @@
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
 # End:
-# mkinstalldirs ends here




More information about the Gnupg-commits mailing list